From 0417885cd2893a87155c89afe79a947004a16ea5 Mon Sep 17 00:00:00 2001
From: Peer Sommerlund <peer.sommerlund@gmail.com>
Date: Thu, 11 Oct 2007 16:45:01 +0100
Subject: [PATCH] mingw-compile.p

Make code compile under MinGW (Windows)
* * *
---
 cache.c               | 2 ++
 cbtcommon/inline.h    | 4 +---
 cbtcommon/sio.h       | 2 ++
 cbtcommon/tcpsocket.c | 9 +++++++--
 cvsps.c               | 2 ++
 util.c                | 6 ++++++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cache.c b/cache.c
index c234408..cf8b56d 100644
--- a/cache.c
+++ b/cache.c
@@ -7,6 +7,8 @@
 #ifdef __MINGW32__
 #include <tsearch/search.h>
 char * strsep(char **str, const char *delim);
+#include <windows.h>
+#define sleep Sleep
 #else
 #include <search.h>
 #endif
diff --git a/cbtcommon/inline.h b/cbtcommon/inline.h
index 776ef26..187fd22 100644
--- a/cbtcommon/inline.h
+++ b/cbtcommon/inline.h
@@ -8,9 +8,7 @@
 
 #ifdef __GNUC__
 #define INLINE __inline__
-#endif
-
-#ifdef WIN32
+#elif defined(WIN32)
 #define INLINE __inline
 #endif
 
diff --git a/cbtcommon/sio.h b/cbtcommon/sio.h
index f6f2978..de1ebda 100644
--- a/cbtcommon/sio.h
+++ b/cbtcommon/sio.h
@@ -9,7 +9,9 @@
 /* include for typedefs */
 #ifdef WIN32
 #include <stdio.h>
+#ifndef __MINGW32__
 typedef int ssize_t;
+#endif
 #else
 #include <unistd.h>
 #endif
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index 27cc13a..64ae098 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -9,7 +9,11 @@
 #include <string.h>
 #endif
 
-#ifdef WIN32
+#ifdef __MINGW32__
+#include <winsock2.h>
+#include <errno.h>
+#undef WIN32
+#elif defined(WIN32)
 #include <winsock2.h>
 #else /* not windows */
 #include <sys/types.h>
@@ -28,7 +32,8 @@
 #include "tcpsocket.h"
 #include "debug.h"
 #include "rcsid.h"
-#ifdef WIN32
+#ifdef __MINGW32__
+#elif defined(WIN32)
 #include "win32fd.h"
 #endif
 
diff --git a/cvsps.c b/cvsps.c
index e57f598..5a74b12 100644
--- a/cvsps.c
+++ b/cvsps.c
@@ -19,7 +19,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <regex.h>
+#ifndef __MINGW32__
 #include <sys/wait.h> /* for WEXITSTATUS - see system(3) */
+#endif
 
 #include <cbtcommon/hash.h>
 #include <cbtcommon/list.h>
diff --git a/util.c b/util.c
index a0feeaf..db335b0 100644
--- a/util.c
+++ b/util.c
@@ -21,7 +21,9 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifndef __MINGW32__
 #include <sys/wait.h>
+#endif
 
 #include <cbtcommon/debug.h>
 
@@ -91,7 +93,11 @@ char *get_cvsps_dir()
     if (stat(prefix, &sbuf) < 0)
     {
 	int ret;
+	#ifdef __MINGW32__
+	ret = mkdir(prefix);
+	#else
 	ret = mkdir(prefix, 0777);
+	#endif
 	if (ret < 0)
 	{
 	    debug(DEBUG_SYSERROR, "Cannot create the cvsps directory '%s'", CVSPS_PREFIX);
-- 
2.11.4.GIT