Merge branch 'master' of github.com:maniacbug/RF24

2011-09-12 19:29:04 -07:00
parent a28e2361fc e1527afc31
commit c419532cbe
5 changed files with 559 additions and 0 deletions
--- a/RF24.cpp
+++ b/RF24.cpp
@@ -19,10 +19,12 @@
 #endif

 // Avoid spurious warnings
+#ifndef NATIVE
 #undef PROGMEM
 #define PROGMEM __attribute__(( section(".progmem.data") ))
 #undef PSTR
 #define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
+#endif

 /****************************************************************************/