Merge remote-tracking branch 'refs/remotes/TMRh20/master'

d5d28965 · akatran · 2055a9a7 · 372562a2 · d5d28965
Commit d5d28965 authored Apr 30, 2016 by akatran
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

RF24_config.h RF24_config.h +1 -1

No files found.
--- a/RF24_config.h
+++ b/RF24_config.h
@@ -130,7 +130,7 @@
  #define pgm_read_word(p) (*(p))
  #define PRIPSTR "%s"

-#elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__) && defined(XMEGA)
+#elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__) || defined(XMEGA)
 	#include <avr/pgmspace.h>
 	#define PRIPSTR "%S"
 #else