Cleanup headers

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1771 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackActivationCount.h

@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackSynchro.h"
 #include "JackTime.h"
+#include "JackTypes.h"
 
 namespace Jack
 {

common/JackAtomic.h

@@ -20,13 +20,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackAtomic__
 #define __JackAtomic__
 
+#include "JackTypes.h"
+
+/*
 typedef unsigned short UInt16;
 #if __LP64__
-typedef unsigned int       UInt32;
-typedef signed int         SInt32;
+typedef unsigned int UInt32;
+typedef signed int   SInt32;
 #else
-typedef unsigned long      UInt32;
-typedef signed long        SInt32;
+typedef unsigned long UInt32;
+typedef signed long   SInt32;
 #endif
 
 #ifdef WIN32
@@ -35,6 +38,7 @@ typedef ULONGLONG UInt64;
 #else
 typedef unsigned long long UInt64;
 #endif
+*/
 
 #if defined(__APPLE__)
 

common/JackConstants.h

@@ -85,12 +85,14 @@ namespace Jack
 
 typedef uint16_t jack_int_t;  // Internal type for ports and refnum
 
+/*
 typedef enum {
     NotTriggered,
     Triggered,
     Running,
     Finished,
 } jack_client_state_t;
+*/
 
 } // end of namespace
 

common/JackTypes.h

@@ -21,6 +21,23 @@
 #ifndef __JackTypes__
 #define __JackTypes__
 
+typedef unsigned short UInt16;
+#if __LP64__
+typedef unsigned int UInt32;
+typedef signed int   SInt32;
+#else
+typedef unsigned long UInt32;
+typedef signed long   SInt32;
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+typedef ULONGLONG UInt64;
+#else
+typedef unsigned long long UInt64;
+#endif
+
+
 namespace Jack
 {