Changeset 364 for trunk/zoo-project/zoo-kernel/zoo_loader.c

Timestamp:

Sep 29, 2012, 3:59:06 PM (12 years ago)

Author:

djay

Message:

Update to make ZOO-Kernel able to compile and run from Windows Platforms. A special thanks to Espen Messel, Knut Landmark and Benrd Härtwig for providing many patches that I can successfully apply on the SVN source tree and to Farkas for continuing requesting for ZOO-Kernel to run on Windows platforms privately and through the ZOO-Discuss mailing list.

File:

• trunk/zoo-project/zoo-kernel/zoo_loader.c (modified) (4 diffs)

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

@@ -26 +26 @@
 #define MALLOC_CHECK 0
 
-#ifdef WIN32
-#include "windows.h"
-#endif
 /**
  * Specific includes
  */
+#ifndef WIN32
 #include "fcgio.h"
 #include "fcgi_config.h" 
 #include "fcgi_stdio.h"
+#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include "service_internal.h"
+#ifdef WIN32
+#include "windows.h"
+#define strtok_r strtok_s
+#endif
 
 extern "C" {
@@ -55 +58 @@
 using namespace std;
 
+#ifndef TRUE
 #define TRUE 1
+#endif
+#ifndef FALSE
 #define FALSE -1
+#endif
 
 int cgiMain(){
@@ -68 +75 @@
   fprintf(cgiOut,"Welcome on ZOO verbose debuging mode \r\n\r\n");
   fflush(cgiOut);
-#endif
-  
-#ifdef DEBUG
   fprintf (stderr, "Addr:%s\n", cgiRemoteAddr); 
   fprintf (stderr, "RequestMethod: (%s) %d %d\n", cgiRequestMethod,strncasecmp(cgiRequestMethod,"post",4),strncmp(cgiContentType,"text/xml",8)==0 || strncasecmp(cgiRequestMethod,"post",4)==0); 
@@ -143 +147 @@
   }
   else{
+#ifdef DEBUG
     dumpMap(tmpMap);
+#endif
     char **array, **arrayStep;
     if (cgiFormEntries(&array) != cgiFormSuccess) {