C:ifying continues..

libraries/MySensors/drivers/RF24/RF24.cpp

@@ -19,7 +19,7 @@ void RF24::csn(bool mode)
   // divider of 4 is the minimum we want.
   // CLK:BUS 8Mhz:2Mhz, 16Mhz:4Mhz, or 20Mhz:5Mhz
 #ifdef ARDUINO
-	#if  ( !defined(RF24_TINY) && !defined (__arm__)  && !defined (SOFTSPI)) || defined (CORE_TEENSY)
+	#if  ( !defined(RF24_TINY) && !defined (__arm__)  && !defined (MY_SOFTSPI)) || defined (CORE_TEENSY)
  			_SPI.setBitOrder(MSBFIRST);
   			_SPI.setDataMode(SPI_MODE0);
 			_SPI.setClockDivider(SPI_CLOCK_DIV2);

libraries/MySensors/drivers/RF24/RF24_config.h

@@ -26,7 +26,7 @@
   //#define SERIAL_DEBUG  
   #define MINIMAL
   //#define SPI_UART  // Requires library from https://github.com/TMRh20/Sketches/tree/master/SPI_UART
-  //#define SOFTSPI   // Requires library from https://github.com/greiman/DigitalIO
+  //#define MY_SOFTSPI   // Requires library from https://github.com/greiman/DigitalIO
   /**********************/
   
   // Define _BV for non-Arduino platforms and for Arduino DUE