From 362b952a684ef4ebb39f8d2c734951956e4d94be Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Mon, 15 Sep 2008 21:09:13 +0000
Subject: [PATCH] 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.

---
 hardware/cores/arduino/WProgram.h    | 5 +++++
 hardware/libraries/Firmata/Firmata.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hardware/cores/arduino/WProgram.h b/hardware/cores/arduino/WProgram.h
index 5f78de27a..20650df11 100755
--- a/hardware/cores/arduino/WProgram.h
+++ b/hardware/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/hardware/libraries/Firmata/Firmata.h b/hardware/libraries/Firmata/Firmata.h
index c556c4a47..a0a6513fc 100644
--- a/hardware/libraries/Firmata/Firmata.h
+++ b/hardware/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();