ecere: Android compilation fixes

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index 5bc5a25..8fa1a9c 100644 (file)
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -55,7 +55,8 @@ private:
 
 #if defined(__ANDROID__)
 
-import "AndroidInterface"
+default const char * AndroidInterface_GetLibLocation();
+
 #include <android/log.h>
 #include <android/native_activity.h>
 
@@ -5139,12 +5140,7 @@ static Module Module_Load(Module fromModule, char * name, AccessMode importAcces
       {
          char * libLocation = null;
 #if defined(__ANDROID__)
-         char loc[MAX_LOCATION];
-         if(androidActivity)
-         {
-            sprintf(loc, "/data/data/com.ecere.%s/lib/lib", androidActivity.moduleName);
-            libLocation = loc;
-         }
+         libLocation = AndroidInterface_GetLibLocation();
 #endif
          library = Instance_Module_Load(libLocation, name, &Load, &Unload);
       }

diff --git a/ecere/src/gui/drivers/AndroidInterface.ec b/ecere/src/gui/drivers/AndroidInterface.ec
index ec7b642..6f1d614 100644 (file)
--- a/ecere/src/gui/drivers/AndroidInterface.ec
+++ b/ecere/src/gui/drivers/AndroidInterface.ec
@@ -885,7 +885,18 @@ struct SavedState
     int y;
 };
 
-/*static */AndroidActivity androidActivity;
+static AndroidActivity androidActivity;
+
+default const char * AndroidInterface_GetLibLocation()
+{
+   if(androidActivity)
+   {
+      static char loc[MAX_LOCATION];
+      sprintf(loc, "/data/data/com.ecere.%s/lib/lib", androidActivity.moduleName);
+      return loc;
+   }
+   return null;
+}
 
 static bool gotInit;
 

diff --git a/ecere/src/sys/Mutex.ec b/ecere/src/sys/Mutex.ec
index 5772a4a..24c5dab 100644 (file)
--- a/ecere/src/sys/Mutex.ec
+++ b/ecere/src/sys/Mutex.ec
@@ -6,6 +6,8 @@
 
 namespace sys;
 
+#undef _GNU_SOURCE
+#undef __USE_UNIX98
 #define _GNU_SOURCE
 #define __USE_UNIX98
 // Platform includes