[Cherokee] r942 patch to compile in MinGW

[Ross Smith II]

You could also just remove the bool define, and change it to int.

Instead of excluding it, should we make cherokee-guardian win32 friendly?

-Ross

--- cherokee.orig/cherokee/win32_misc.h 2007-08-13 02:27:14.320402000 -0700
+++ cherokee/cherokee/win32_misc.h      2007-10-23 10:13:45.491625000 -0700
@@ -34,6 +34,11 @@

 #include "buffer.h"

+/* bool definition
+ */
+#ifndef bool
+# define bool  int
+#endif

 #undef  localtime_r       /* in <pthread.h> */
 #define SHUT_WR           SD_SEND
--- cherokee.orig/cherokee/win32_misc.c 2007-08-13 02:27:14.320402000 -0700
+++ cherokee/cherokee/win32_misc.c      2007-10-23 10:13:38.726000000 -0700
@@ -61,11 +61,6 @@
      SECURITY_DESCRIPTOR sd;
 };

-/* bool definition
- */
-#ifndef bool
-# define bool  int
-#endif

 /* Globals
  */
--- cherokee.orig/cherokee/Makefile.am  2007-09-18 03:27:46.820413000 -0700
+++ cherokee/cherokee/Makefile.am       2007-10-25 08:05:17.502875000 -0700
@@ -982,7 +982,11 @@
 #
 # Main binary: Cherokee server
 #
-sbin_PROGRAMS = cherokee cherokee-guardian cherokee-admin
+sbin_PROGRAMS = cherokee cherokee-admin
+
+if !PLATFORM_WIN32
+sbin_PROGRAMS += cherokee-guardian
+endif

 cherokee_SOURCES = main.c
 cherokee_LDADD   = \

--- cherokee.orig/cherokee/win32_misc.h 2007-08-13 02:27:14.320402000 -0700
+++ cherokee/cherokee/win32_misc.h      2007-10-23 10:13:45.491625000 -0700
@@ -34,6 +34,11 @@
 
 #include "buffer.h"
 
+/* bool definition
+ */
+#ifndef bool
+# define bool  int
+#endif
 
 #undef  localtime_r       /* in <pthread.h> */
 #define SHUT_WR           SD_SEND
--- cherokee.orig/cherokee/win32_misc.c 2007-08-13 02:27:14.320402000 -0700
+++ cherokee/cherokee/win32_misc.c      2007-10-23 10:13:38.726000000 -0700
@@ -61,11 +61,6 @@
      SECURITY_DESCRIPTOR sd;
 };
 
-/* bool definition 
- */
-#ifndef bool
-# define bool  int
-#endif
 
 /* Globals 
  */
--- cherokee.orig/cherokee/Makefile.am  2007-09-18 03:27:46.820413000 -0700
+++ cherokee/cherokee/Makefile.am       2007-10-25 08:05:17.502875000 -0700
@@ -982,7 +982,11 @@
 #
 # Main binary: Cherokee server
 #
-sbin_PROGRAMS = cherokee cherokee-guardian cherokee-admin
+sbin_PROGRAMS = cherokee cherokee-admin
+
+if !PLATFORM_WIN32
+sbin_PROGRAMS += cherokee-guardian
+endif
 
 cherokee_SOURCES = main.c
 cherokee_LDADD   = \

_______________________________________________
Cherokee mailing list
Cherokee@cherokee-project.com
http://cherokee-project.com/cgi-bin/mailman/listinfo/cherokee