From 136ba3bb13f9ed0b7e87d2609c9895d92abbdc34 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 23 Feb 2009 13:51:20 +0000
Subject: [PATCH] Another fix in systemdeps.h and types.h: jack_time_t now
 uniquely defined in types.h.

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

diff --git a/systemdeps.h b/systemdeps.h
index 36e2379..939e3c3 100644
--- a/systemdeps.h
+++ b/systemdeps.h
@@ -22,36 +22,34 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #ifdef WIN32
 
-#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
+#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
-
-typedef int64_t _jack_time_t;
+    #ifndef pthread_t
+        typedef HANDLE pthread_t;
+    #endif
+#else               /* other compilers ...*/
+    #include <inttypes.h>
+    #include <pthread.h>
+    #include <sys/types.h>
+#endif
 
 #endif /* WIN32 */
 
@@ -59,7 +57,6 @@ typedef int64_t _jack_time_t;
     #include <inttypes.h>
     #include <pthread.h>
     #include <sys/types.h>
-    typedef uint64_t _jack_time_t;
 #endif /* __APPLE__ || __linux__ || __sun__ || sun */
 
 #endif