aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/main.cpp
diff options
context:
space:
mode:
authoramcewen <amcewen@bcs.org.uk>2011-08-28 20:28:53 +0100
committeramcewen <amcewen@bcs.org.uk>2011-08-28 20:28:53 +0100
commit8ce77304f796e077f594859f270f9f024dc05605 (patch)
tree285233e5b57f0029551056b1951e4e539b265951 /cores/arduino/main.cpp
parente852be3e97763e621a0f8014a3db4bf92a650b50 (diff)
parentf9d50a793010db3a2968262f35d34edaf048a650 (diff)
Merge branch 'master' into wifly_integration
Diffstat (limited to 'cores/arduino/main.cpp')
-rwxr-xr-xcores/arduino/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index cc6e81d..3c46f1e 100755
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -1,4 +1,5 @@
-#include <WProgram.h>
+#define ARDUINO_MAIN
+#include <Arduino.h>
int main(void)
{