From 858971da6ea5aeeac88ea2403d3d55cf8f99d146 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@gmail.com>
Date: Fri, 25 May 2012 15:04:49 +1000
Subject: [PATCH] Use Arduino.h on newer versions of the toolchain

---
 libraries/BlinkLED/BlinkLED.cpp                   | 4 ++++
 libraries/BlinkLED/ChaseLEDs.cpp                  | 4 ++++
 libraries/I2C/SoftI2C.cpp                         | 4 ++++
 libraries/LCD/LCD.cpp                             | 4 ++++
 libraries/LCD/utility/LiquidCrystal.cpp           | 6 +++++-
 libraries/Melody/Melody.cpp                       | 4 ++++
 libraries/PowerSave/PowerSave.h                   | 4 ++++
 libraries/RTC/DS1307RTC.cpp                       | 4 ++++
 libraries/RTC/DS3232RTC.cpp                       | 4 ++++
 libraries/RTC/RTC.cpp                             | 4 ++++
 libraries/RTC/examples/AlarmClock/FrontScreen.cpp | 4 ++++
 libraries/RTC/examples/AlarmClock/SetMelody.cpp   | 4 ++++
 12 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/libraries/BlinkLED/BlinkLED.cpp b/libraries/BlinkLED/BlinkLED.cpp
index 3ff990a9..85ca93b6 100644
--- a/libraries/BlinkLED/BlinkLED.cpp
+++ b/libraries/BlinkLED/BlinkLED.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "BlinkLED.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class BlinkLED BlinkLED.h <BlinkLED.h>
diff --git a/libraries/BlinkLED/ChaseLEDs.cpp b/libraries/BlinkLED/ChaseLEDs.cpp
index a9ae25c2..4a7bc0b4 100644
--- a/libraries/BlinkLED/ChaseLEDs.cpp
+++ b/libraries/BlinkLED/ChaseLEDs.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "ChaseLEDs.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class ChaseLEDs ChaseLEDs.h <ChaseLEDs.h>
diff --git a/libraries/I2C/SoftI2C.cpp b/libraries/I2C/SoftI2C.cpp
index ec93ea37..eaf4bd49 100644
--- a/libraries/I2C/SoftI2C.cpp
+++ b/libraries/I2C/SoftI2C.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "SoftI2C.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class SoftI2C SoftI2C.h <SoftI2C.h>
diff --git a/libraries/LCD/LCD.cpp b/libraries/LCD/LCD.cpp
index 802fe88a..7582b2bf 100644
--- a/libraries/LCD/LCD.cpp
+++ b/libraries/LCD/LCD.cpp
@@ -22,7 +22,11 @@
 
 #include "LCD.h"
 #include <avr/pgmspace.h>
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 #define LCD_BACK_LIGHT          3        // LCD backlight is on D3
 #define LCD_BUTTON_PIN          A0       // Button state is on A0
diff --git a/libraries/LCD/utility/LiquidCrystal.cpp b/libraries/LCD/utility/LiquidCrystal.cpp
index 23713f47..6150486e 100644
--- a/libraries/LCD/utility/LiquidCrystal.cpp
+++ b/libraries/LCD/utility/LiquidCrystal.cpp
@@ -3,7 +3,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include "WProgram.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
+#include <WProgram.h>
+#endif
 
 // When the display powers up, it is configured as follows:
 //
diff --git a/libraries/Melody/Melody.cpp b/libraries/Melody/Melody.cpp
index 3960a5d1..b3552244 100644
--- a/libraries/Melody/Melody.cpp
+++ b/libraries/Melody/Melody.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "Melody.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class Melody Melody.h <Melody.h>
diff --git a/libraries/PowerSave/PowerSave.h b/libraries/PowerSave/PowerSave.h
index b3f76115..0cd9cd10 100644
--- a/libraries/PowerSave/PowerSave.h
+++ b/libraries/PowerSave/PowerSave.h
@@ -23,7 +23,11 @@
 #ifndef PowerSave_h
 #define PowerSave_h
 
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 inline void unusedPin(uint8_t pin)
 {
diff --git a/libraries/RTC/DS1307RTC.cpp b/libraries/RTC/DS1307RTC.cpp
index 48c979b3..2fbbf1ee 100644
--- a/libraries/RTC/DS1307RTC.cpp
+++ b/libraries/RTC/DS1307RTC.cpp
@@ -22,7 +22,11 @@
 
 #include "DS1307RTC.h"
 #include "../I2C/I2CMaster.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class DS1307RTC DS1307RTC.h <DS1307RTC.h>
diff --git a/libraries/RTC/DS3232RTC.cpp b/libraries/RTC/DS3232RTC.cpp
index 087ed4f7..4f928395 100644
--- a/libraries/RTC/DS3232RTC.cpp
+++ b/libraries/RTC/DS3232RTC.cpp
@@ -22,7 +22,11 @@
 
 #include "DS3232RTC.h"
 #include "../I2C/I2CMaster.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 /**
  * \class DS3232RTC DS3232RTC.h <DS3232RTC.h>
diff --git a/libraries/RTC/RTC.cpp b/libraries/RTC/RTC.cpp
index d57e2f67..fd0681dc 100644
--- a/libraries/RTC/RTC.cpp
+++ b/libraries/RTC/RTC.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "RTC.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libraries/RTC/examples/AlarmClock/FrontScreen.cpp b/libraries/RTC/examples/AlarmClock/FrontScreen.cpp
index d68836db..43c5619e 100644
--- a/libraries/RTC/examples/AlarmClock/FrontScreen.cpp
+++ b/libraries/RTC/examples/AlarmClock/FrontScreen.cpp
@@ -21,7 +21,11 @@
  */
 
 #include "FrontScreen.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 // Special characters for indicators.
 #define IND_BATTERY_EMPTY       0
diff --git a/libraries/RTC/examples/AlarmClock/SetMelody.cpp b/libraries/RTC/examples/AlarmClock/SetMelody.cpp
index 05480cbd..15c24f6b 100644
--- a/libraries/RTC/examples/AlarmClock/SetMelody.cpp
+++ b/libraries/RTC/examples/AlarmClock/SetMelody.cpp
@@ -22,7 +22,11 @@
 
 #include "SetMelody.h"
 #include "LowPowerMelody.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
 #include <WProgram.h>
+#endif
 
 extern LowPowerMelody alarmMelody;
 extern int defaultMelodyNotes[5];