From 0e86ff0648d9030c49e7e7897353632301bb236f 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
---
 ChangeLog                |  8 ++++--
 common/jack/systemdeps.h | 53 +++++++++++++++++++---------------------
 common/jack/types.h      |  3 +--
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d46249d9..39ee2723 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,12 +22,16 @@ Michael Voigt
 ---------------------------
   Jackdmp changes log
 ---------------------------
+
+2009-02-23 Stephane Letz  <letz@grame.fr>
+
+	* Another fix in systemdeps.h and types.h: jack_time_t now uniquely defined in types.h.
 
 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.
-      * Cleanup systemdeps.h on Windows.
+	* Change fMulticastIP handling in JackNetInterface.
+        * Cleanup systemdeps.h on Windows.
 
 2009-02-17 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/jack/systemdeps.h b/common/jack/systemdeps.h
index 36e2379b..939e3c35 100644
--- a/common/jack/systemdeps.h
+++ b/common/jack/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
diff --git a/common/jack/types.h b/common/jack/types.h
index 99f1007a..595dd510 100644
--- a/common/jack/types.h
+++ b/common/jack/types.h
@@ -40,8 +40,7 @@ typedef uint32_t	jack_nframes_t;
  * Type used to represent the value of free running
  * monotonic clock with units of microseconds.
  */
-
-typedef _jack_time_t jack_time_t;
+typedef uint64_t jack_time_t;
 
 /**
  *  Maximum size of @a load_init string passed to an internal client