Fix issues with commit 4197a3f on some linux distributions and old mingw environments...

diff --git a/client/whereami.c b/client/whereami.c
index 289aeb1f419e37dc617e5639acd7e0b9e3692a9c..021ad8748c9b0da422c397dbbfc901930126a1f3 100644 (file)
--- a/client/whereami.c
+++ b/client/whereami.c
@@ -51,7 +51,7 @@ extern "C" {
 #pragma warning(push, 3)
 #endif
 #include <windows.h>
 #pragma warning(push, 3)
 #endif
 #include <windows.h>

-#include <intrin.h>
+//#include <intrin.h>                  // not required and doesn't exist in old mingw environments

 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif


@@ -136,7 +136,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
   return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
 }
 
   return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
 }
 

-WAI_NOINLINE
+// GetModuleHandleEx() is not available on old mingw environments. We don't need getModulePath() yet. 
+// Sacrifice it for the time being to improve backwards compatibility
+/* WAI_NOINLINE

 WAI_FUNCSPEC
 int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 {
 WAI_FUNCSPEC
 int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 {


@@ -157,13 +159,15 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
 
   return length;
 }
 
   return length;
 }

+ */

 
 #elif defined(__linux__)
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #elif defined(__linux__)
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <limits.h>
+// #include <limits.h>     // not all linux distributions define PATH_MAX in limits.h because it depends on the filesystem. Therefore use...
+#include <linux/limits.h>

 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif