Use Arduino.h on newer versions of the toolchain

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>

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>

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>

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

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:
 //

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>

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)
 {

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>

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>

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>
 

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

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];