merge
authorMario de Sousa <msousa@fe.up.pt>
Thu, 22 Nov 2012 19:19:48 +0000
changeset 744 6ecb38715724
parent 742 a9741eb5aaab (current diff)
parent 743 fbf77edf54ca (diff)
child 751 0a5c050d64bb
merge
--- a/lib/iec_types_all.h	Thu Nov 22 19:05:29 2012 +0000
+++ b/lib/iec_types_all.h	Thu Nov 22 19:19:48 2012 +0000
@@ -62,8 +62,10 @@
 /* Include non windows.h clashing typedefs */
 #include "iec_types.h"
 
-#define TRUE 1
-#define FALSE 0
+#ifndef TRUE
+  #define TRUE 1
+  #define FALSE 0
+#endif
 
 #define __IEC_DEBUG_FLAG 0x01
 #define __IEC_FORCE_FLAG 0x02