From ba6128e4263bf91415cd371439468f1577f7ebd8 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
---
 ChangeLog                | 11 +++----
 common/jack/systemdeps.h | 62 +++++++++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dbe2a25..d46249d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,15 +22,16 @@ Michael Voigt
 ---------------------------
   Jackdmp changes log
 ---------------------------
-
+
 2009-02-20 Stephane Letz  <letz@grame.fr>
 
-	* Add InitConnection and InitRendering methods in JackNetSlaveInterface, better packet type checking in JackNetSlaveInterface::SyncRecv.
-	* Change fMulticastIP handling in JackNetInterface.
+	* Add InitConnection and InitRendering methods in JackNetSlaveInterface, better packet type checking in JackNetSlaveInterface::SyncRecv.
+	* Change fMulticastIP handling in JackNetInterface.
+      * Cleanup systemdeps.h on Windows.
 
 2009-02-17 Stephane Letz  <letz@grame.fr>
 
-	* Fix the mutex/signal classes on Windows.
+	* Fix the mutex/signal classes on Windows.
         * Client incorrect re-naming fixed: now done at fifo level only.
 
 2009-02-16 Stephane Letz  <letz@grame.fr>
@@ -39,7 +40,7 @@ Michael Voigt
 
 2009-02-11 Stephane Letz  <letz@grame.fr>
 
-	* Merge Solaris branch back on trunk.
+	* Merge Solaris branch back on trunk.
         * Equality of input and output buffer size removed (for now) in JackOSSDriver.
 
 2009-02-10 Stephane Letz  <letz@grame.fr>
diff --git a/common/jack/systemdeps.h b/common/jack/systemdeps.h
index 0099449c..36e2379b 100644
--- a/common/jack/systemdeps.h
+++ b/common/jack/systemdeps.h
@@ -22,34 +22,44 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #ifdef WIN32
 
-#include <windows.h>
-
-#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 */
-
-#if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) 
+#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
 
-#include <inttypes.h>
-#include <pthread.h>
-#include <sys/types.h>
+typedef int64_t _jack_time_t;
 
-typedef uint64_t _jack_time_t;
+#endif /* WIN32 */
 
-#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