Fix conflicts with arduino macros and stdlib

core/MyHwLinuxGeneric.cpp

@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <stdarg.h>
 #include <string.h>
+#include <iostream>
 #include <fstream>
 #include <sys/stat.h>
 

core/MyHwLinuxGeneric.h

@@ -21,8 +21,7 @@
 #define MyHwLinuxGeneric_h
 
 #include "MyHw.h"
-#include <stdlib.h>
-#include <iostream>
+#include <cstdlib>
 #include <pthread.h>
 
 #define MY_SERIALDEVICE Serial
@@ -32,8 +31,6 @@
 #define hwWatchdogReset()
 #define hwReboot()
 
-using namespace std;
-
 void hwInit();
 void hwReadConfigBlock(void* buf, void* adr, size_t length);
 void hwWriteConfigBlock(void* buf, void* adr, size_t length);
@@ -73,7 +70,7 @@ static __inline__ void __hwLock() {
 #endif	/* DOXYGEN */
 
 #ifndef DOXYGEN
-  #define MY_CRITICAL_SECTION ATOMIC_BLOCK
-#endif  /* DOXYGEN */
+	#define MY_CRITICAL_SECTION ATOMIC_BLOCK
+#endif	/* DOXYGEN */
 
 #endif

core/MyMessage.cpp

@@ -23,10 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef ARDUINO
-	#define min(a,b) ((a)<(b)?(a):(b))
-#endif
-
 MyMessage::MyMessage()
 {
     clear();
@@ -121,7 +117,7 @@ char* MyMessage::getString(char *buffer) const {
 		} else if (payloadType == P_ULONG32) {
 			ultoa(ulValue, buffer, 10);
 		} else if (payloadType == P_FLOAT32) {
-			dtostrf(fValue,2,min(fPrecision, 8),buffer);
+			dtostrf(fValue,2,min(fPrecision, (uint8_t)8),buffer);
 		} else if (payloadType == P_CUSTOM) {
 			return getCustomString(buffer);
 		}
@@ -216,12 +212,12 @@ MyMessage& MyMessage::setDestination(uint8_t _destination) {
 MyMessage& MyMessage::set(void* value, uint8_t length) {
 	miSetPayloadType(P_CUSTOM);
 	miSetLength(length);
-	memcpy(data, value, min(length, MAX_PAYLOAD));
+	memcpy(data, value, min(length, (uint8_t)MAX_PAYLOAD));
 	return *this;
 }
 
 MyMessage& MyMessage::set(const char* value) {
-	uint8_t length = value == NULL ? 0 : min(strlen(value), MAX_PAYLOAD);
+	uint8_t length = value == NULL ? 0 : min(strlen(value), (size_t)MAX_PAYLOAD);
 	miSetLength(length);
 	miSetPayloadType(P_STRING);
 	if (length) {