Better header definitions

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@421 0c269be4-1314-0410-8aa9-9f06e86f4224

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

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>

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
 

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__ */

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
 
 /**