Changeset 370 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Oct 10, 2012, 10:11:10 AM (12 years ago)

Author:

djay

Message:

Add the capability to use a specific Python version by detecting if python-VERS-config exists or if python-config-VERS exists. Add NEED_STRCASESTR to nmake.opt for MapServer? support. Fix for the name of layer class on Unix/Windows?. Provide definition of strcasestr if and only if MapServer? was not activated.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (1 diff)

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

@@ -87 +87 @@
 #ifdef WIN32
 extern "C" {
-__declspec(dllexport) char *strcasestr(char const *a, char const *b) { 
-    char *x=_strdup(a); 
-    char *y=_strdup(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; 
-} 
+  __declspec(dllexport) char *strcasestr(char const *a, char const *b)
+#ifndef USE_MS
+ { 
+  char *x=_strdup(a); 
+  char *y=_strdup(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