aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid A. Mellis <d.mellis@arduino.cc>2008-09-15 21:09:13 +0000
committerDavid A. Mellis <d.mellis@arduino.cc>2008-09-15 21:09:13 +0000
commite94fa49d9bfee00e61a3b496b5e9cbb22dec309f (patch)
treeddcff6932443b074f536df12116297192bcec2c3
parentbf4484d02c6e744488561a79f28807dc32dba705 (diff)
Adding #ifdef guard to WProgram.h to prevent multiple #includes.
Removing Print class inheritance from Firmata since it's not clear that it can be implemented in a way that's compatible with the Firmata protocol and the Print class interface.
-rwxr-xr-xcores/arduino/WProgram.h5
-rw-r--r--libraries/Firmata/Firmata.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/cores/arduino/WProgram.h b/cores/arduino/WProgram.h
index 5f78de2..20650df 100755
--- a/cores/arduino/WProgram.h
+++ b/cores/arduino/WProgram.h
@@ -1,3 +1,6 @@
+#ifndef WProgram_h
+#define WProgram_h
+
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -17,3 +20,5 @@ long random(long, long);
void randomSeed(unsigned int);
long map(long, long, long, long, long);
#endif
+
+#endif \ No newline at end of file
diff --git a/libraries/Firmata/Firmata.h b/libraries/Firmata/Firmata.h
index c556c4a..a0a6513 100644
--- a/libraries/Firmata/Firmata.h
+++ b/libraries/Firmata/Firmata.h
@@ -67,7 +67,7 @@ extern "C" {
// TODO make it a subclass of HardwareSerial
-class FirmataClass : public Print
+class FirmataClass
{
public:
FirmataClass();