Changeset 843 for trunk

Timestamp:

Aug 7, 2017, 8:53:53 PM (7 years ago)

Author:

jmckenna

Message:

handle duplicate strcasestr declarations on Windows

Location:

trunk/zoo-project/zoo-kernel

Files:

• service.c (modified) (1 diff)
• service.h (modified) (1 diff)
• zoo_loader.c (modified) (1 diff)
• zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/service.c

@@ -1594 +1594 @@
   m=&trorf;
 }
+
+#ifdef WIN32
+char *strcasestr (char const *a, char const *b)
+#ifndef USE_MS
+  {
+    char *x = zStrdup (a);
+    char *y = zStrdup (b);
+ 
+      x = _strlwr (x);
+      y = _strlwr (y);
+    char *pos = strstr (x, y);
+    char *ret = pos == NULL ? NULL : (char *) (a + (pos - x));
+      free (x);
+      free (y);
+      return ret;
+  };
+#else
+   ;
+#endif
+#endif

trunk/zoo-project/zoo-kernel/service.h

@@ -32 +32 @@
 #else
 #define ZOO_DLL_EXPORT 
+#endif
+
+#ifdef WIN32
+ZOO_DLL_EXPORT char *strcasestr (char const *,char const *);
 #endif
 

trunk/zoo-project/zoo-kernel/zoo_loader.c

@@ -63 +63 @@
 #ifndef FALSE
 #define FALSE -1
-#endif
-
-#ifdef WIN32
-extern "C"
-{
-  __declspec (dllexport) char *strcasestr (char const *a, char const *b)
-#ifndef USE_MS
-  {
-    char *x = zStrdup (a);
-    char *y = zStrdup (b);
-
-      x = _strlwr (x);
-      y = _strlwr (y);
-    char *pos = strstr (x, y);
-    char *ret = pos == NULL ? NULL : (char *) (a + (pos - x));
-      free (x);
-      free (y);
-      return ret;
-  };
-#else
-   ;
-#endif
-}
 #endif
 

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -40 +40 @@
 #include "ulinet.h"
 
-#include <libintl.h>
+#include <libinti.h>
 #include <locale.h>
 #include <string.h>
@@ -107 +107 @@
 #ifndef WIN32
 extern char **environ;
-#endif
-
-
-#ifdef WIN32
-extern "C"
-{
-  __declspec (dllexport) char *strcasestr (char const *a, char const *b)
-#ifndef USE_MS
-  {
-    char *x = zStrdup (a);
-    char *y = zStrdup (b);
-
-      x = _strlwr (x);
-      y = _strlwr (y);
-    char *pos = strstr (x, y);
-    char *ret = pos == NULL ? NULL : (char *) (a + (pos - x));
-      free (x);
-      free (y);
-      return ret;
-  };
-#else
-   ;
-#endif
-}
 #endif