Fix conflicts with arduino macros and stdlib

This commit is contained in:
Marcelo Aquino
2016-08-16 13:43:19 -03:00
parent c4b2a809aa
commit 768b70e882
5 changed files with 32 additions and 25 deletions
+3 -6
View File
@@ -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