diff options
author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 20:26:47 -0400 |
---|---|---|
committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-08 20:26:47 -0400 |
commit | c0ad36ad4341b90a0bd3acde1e50ce85dfd2f4a8 (patch) | |
tree | ce305833da2f7cac516d33bcb6bd7cebeb2d0adb /cores/arduino/HardwareSerial.h | |
parent | e52cf0e4203bd6dda76c2544b0479548f465a0c7 (diff) | |
parent | 8b13206e655cd9c1123d842cab1fdd0afd6edc8b (diff) |
Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Conflicts:
build/linux/dist/tools/avrdude.conf
Diffstat (limited to 'cores/arduino/HardwareSerial.h')
-rw-r--r-- | cores/arduino/HardwareSerial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h index d0dca06..176abe1 100644 --- a/cores/arduino/HardwareSerial.h +++ b/cores/arduino/HardwareSerial.h @@ -75,6 +75,6 @@ class HardwareSerial : public Stream extern HardwareSerial Serial3; #endif -extern void serialEventRun(void); +extern void serialEventRun(void) __attribute__((weak)); #endif |