From aa07046e6b041c1464e14921ae252c6ad867d409 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Sat, 18 Aug 2012 15:42:16 -0400
Subject: [PATCH] ecere/com: Worked around conflicts building for Android

---
 ecere/src/com/String.ec    | 2 ++
 ecere/src/com/dataTypes.ec | 2 ++
 ecere/src/sys/Mutex.ec     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/ecere/src/com/String.ec b/ecere/src/com/String.ec
index f05900f..1c18bd3 100644
--- a/ecere/src/com/String.ec
+++ b/ecere/src/com/String.ec
@@ -1,5 +1,6 @@
 namespace sys;
 
+#define set _set
 #define uint _uint
 
 default:
@@ -16,6 +17,7 @@ default:
 #endif
 
 #undef uint
+#undef set
 private:
 
 import "instance"
diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index f23c885..2db5f1d 100644
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -1803,8 +1803,10 @@ void InitializeDataTypes(Module module)
    RegisterClass_String(module);
 }
 
+#define uint _uint
 #include <stdarg.h>
 #include <stdio.h>
+#undef uint
 
 public int PrintStdArgsToBuffer(char * buffer, int maxLen, typed_object object, va_list args)
 {
diff --git a/ecere/src/sys/Mutex.ec b/ecere/src/sys/Mutex.ec
index 21cd192..fa0f3e4 100644
--- a/ecere/src/sys/Mutex.ec
+++ b/ecere/src/sys/Mutex.ec
@@ -2,6 +2,7 @@ namespace sys;
 
 // Platform includes
 #define uint _uint
+#define set _set
 #if defined(__WIN32__)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -9,6 +10,7 @@ namespace sys;
 #include <pthread.h>
 #endif
 #undef uint
+#undef set
 
 import "instance"
 
-- 
1.8.3.1