Merge remote branch 'upstream/new-extension'

Moved my fork to the Arduino 1.0 codebase

1 files changed, 6 insertions, 5 deletions

diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
index d2014bf..bf10b14 100755
--- a/cores/arduino/Print.h
+++ b/cores/arduino/Print.h
@@ -30,7 +30,6 @@
 #define HEX 16
 #define OCT 8
 #define BIN 2
-#define BYTE 0
 
 class Print
 {
@@ -42,10 +41,11 @@ class Print
     virtual void write(const char *str);
     virtual void write(const uint8_t *buffer, size_t size);
     
+    void print(const __FlashStringHelper *);
     void print(const String &);
     void print(const char[]);
-    void print(char, int = BYTE);
-    void print(unsigned char, int = BYTE);
+    void print(char);
+    void print(unsigned char, int = DEC);
     void print(int, int = DEC);
     void print(unsigned int, int = DEC);
     void print(long, int = DEC);
@@ -53,10 +53,11 @@ class Print
     void print(double, int = 2);
     void print(const Printable&);
 
+    void println(const __FlashStringHelper *);
     void println(const String &s);
     void println(const char[]);
-    void println(char, int = BYTE);
-    void println(unsigned char, int = BYTE);
+    void println(char);
+    void println(unsigned char, int = DEC);
     void println(int, int = DEC);
     void println(unsigned int, int = DEC);
     void println(long, int = DEC);