Changeset 933 for branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

May 31, 2019, 3:03:21 PM (5 years ago)

Author:

knut

Message:

Resolve certain string-related type conflicts, e.g., char* vs. const char* or char[N], that may cause errors in some build environments. Resolve a problem with the include order of fcgi_stdio.h (note: should verify that this harmonizes with resolution of same problem in trunk).

File:

• branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (2 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -854 +854 @@
     char* filepath = kvp + strlen(key);
     strncpy(kvp, key, strlen(key));
-    addToCache(m, tmpReq->value, tmpReq->value, "text/xml", strlen(tmpReq->value), 
+    addToCache(m, tmpReq->value, tmpReq->value, (char*) "text/xml", strlen(tmpReq->value), 
                filepath, FILENAME_MAX);
     if (filepath == NULL) {
@@ -2001 +2001 @@
 #ifndef WIN32
                             (LPCTSTR)
+#else
+          (char*)
 #endif
                             "ZooWPSClient\0",