From f70dd81b9d0713ed09f32cf02b24fe0a3cfab4ab Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 20 Feb 2009 15:51:03 +0000
Subject: [PATCH] Cleanup systemdeps.h on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3331 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 systemdeps.h | 62 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/systemdeps.h b/systemdeps.h
index 0099449..36e2379 100644
--- a/systemdeps.h
+++ b/systemdeps.h
@@ -22,34 +22,44 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #ifdef WIN32
 
-#include <windows.h>
+#include <windows.h>
+
+#ifdef _MSC_VER     /* Microsoft compiler */
+    #define __inline__ inline
+    #ifndef int8_t
+        typedef char int8_t;
+        typedef unsigned char uint8_t;
+        typedef short int16_t;
+        typedef unsigned short uint16_t;
+        typedef long int32_t;
+        typedef unsigned long uint32_t;
+        typedef LONGLONG int64_t;
+        typedef ULONGLONG uint64_t;
+    #endif
+    #ifndef pthread_t
+        typedef HANDLE pthread_t;
+    #endif
+#elif __MINGW32__   /* MINGW */
+    #include <stdint.h>
+    #include <sys/types.h>
+    #ifndef pthread_t
+        typedef HANDLE pthread_t;
+    #endif
+#else               /* other compilers ...*/
+    #include <inttypes.h>
+    #include <pthread.h>
+    #include <sys/types.h>
+#endif
 
-#ifdef __MINGW32__
-#include <stdint.h>
-#include <sys/types.h>
-#else
-#define __inline__ inline
-typedef char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef long int32_t;
-typedef unsigned long uint32_t;
-typedef LONGLONG int64_t;
-typedef ULONGLONG uint64_t;
-#endif
-typedef HANDLE pthread_t;
-typedef int64_t _jack_time_t;
-#endif // WIN32 */
+typedef int64_t _jack_time_t;
 
-#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) 
+#endif /* WIN32 */
 
-#include <inttypes.h>
-#include <pthread.h>
-#include <sys/types.h>
-
-typedef uint64_t _jack_time_t;
-
-#endif // __APPLE__ || __linux__ */
+#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun)
+    #include <inttypes.h>
+    #include <pthread.h>
+    #include <sys/types.h>
+    typedef uint64_t _jack_time_t;
+#endif /* __APPLE__ || __linux__ || __sun__ || sun */
 
 #endif