From 71d404f8f5443db3869c419449ff99d267e3d9fb Mon Sep 17 00:00:00 2001
From: trutkin <trutkin@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 16 Jun 2003 22:38:16 +0000
Subject: [PATCH] Better header definitions

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@421 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 configure.in                |  2 +-
 example-clients/transport.c |  1 +
 jack/internal.h             |  6 +++---
 jack/time.h                 | 25 ++++++++++++-------------
 jack/types.h                |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/configure.in b/configure.in
index 22523a8..072d021 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=72
-JACK_MICRO_VERSION=4
+JACK_MICRO_VERSION=5
 
 dnl ---
 dnl HOWTO: updating the jack protocal version
diff --git a/example-clients/transport.c b/example-clients/transport.c
index 6b6fffd..8f83d8d 100644
--- a/example-clients/transport.c
+++ b/example-clients/transport.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <jack/jack.h>
diff --git a/jack/internal.h b/jack/internal.h
index 28b401d..2785cb6 100644
--- a/jack/internal.h
+++ b/jack/internal.h
@@ -43,10 +43,10 @@
 #define DEBUG(format,args...) \
 	printf ("jack:%5d:%Lu %s:%s:%d: " format "\n", getpid(), jack_get_microseconds(), __FILE__, __FUNCTION__, __LINE__ , ## args)
 #else
-#if defined(linux) 
-    #define DEBUG(format,args...)
-#elif defined(__APPLE__) && defined(__POWERPC__) 
+#if defined(__APPLE__) && defined(__POWERPC__) 
     #define DEBUG(format...)
+#else
+    #define DEBUG(format,args...)
 #endif
 #endif
 
diff --git a/jack/time.h b/jack/time.h
index 46cb6cc..ad0f03d 100644
--- a/jack/time.h
+++ b/jack/time.h
@@ -25,7 +25,18 @@
 
 extern void jack_init_time ();
 
-#if defined(linux)
+#if defined(__APPLE__) && defined(__POWERPC__) 
+
+#include <mach/mach_time.h>
+
+extern double __jack_time_ratio;
+
+static inline jack_time_t jack_get_microseconds(void) 
+{  
+        return  mach_absolute_time () * __jack_time_ratio;
+}
+
+#else
 
 #include <jack/cycles.h>
 
@@ -37,18 +48,6 @@ static inline jack_time_t jack_get_microseconds (void) {
 	return get_cycles() / __jack_cpu_mhz;
 }
 
-
-#elif defined(__APPLE__) && defined(__POWERPC__) 
-
-#include <mach/mach_time.h>
-
-extern double __jack_time_ratio;
-
-static inline jack_time_t jack_get_microseconds(void) 
-{  
-        return  mach_absolute_time () * __jack_time_ratio;
-}
-
 #endif
 
 #endif /* __jack_time_h__ */
diff --git a/jack/types.h b/jack/types.h
index 6bf93e6..1feba11 100644
--- a/jack/types.h
+++ b/jack/types.h
@@ -40,10 +40,10 @@ typedef unsigned long        jack_nframes_t;
  * monotonic clock with units of microseconds.
  */
 
-#if defined(linux)
-typedef unsigned long long jack_time_t;
-#elif defined(__APPLE__) && defined(__POWERPC__) 
+#if defined(__APPLE__) && defined(__POWERPC__) 
 typedef double jack_time_t;
+#else
+typedef unsigned long long jack_time_t;
 #endif
 
 /**