Merge pull request #15 from bryanmtdt/master

Change swap def to swapOLED, to avoid problems with some platforms

Author: jimblom

src/SFE_MicroOLED.cpp

@@ -491,13 +491,13 @@ Draw line using color and mode from x0,y0 to x1,y1 of the screen buffer.
 void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t color, uint8_t mode) {
 	uint8_t steep = abs(y1 - y0) > abs(x1 - x0);
 	if (steep) {
-		swap(x0, y0);
-		swap(x1, y1);
+		swapOLED(x0, y0);
+		swapOLED(x1, y1);
 	}
 
 	if (x0 > x1) {
-		swap(x0, x1);
-		swap(y0, y1);
+		swapOLED(x0, x1);
+		swapOLED(y0, y1);
 	}
 
 	uint8_t dx, dy;

src/SFE_MicroOLED.h

@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	#include <pgmspace.h>
 #endif
 
-#define swap(a, b) { uint8_t t = a; a = b; b = t; }
+#define swapOLED(a, b) { uint8_t t = a; a = b; b = t; }
 
 #define I2C_ADDRESS_SA0_0 0b0111100
 #define I2C_ADDRESS_SA0_1 0b0111101