From 347c6b874b5ecd45013f563046f96e77a4d06de4 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 8 Jul 2009 13:14:44 +0000
Subject: [PATCH] Correct 64/32 mixed compilation again.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3582 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackAtomicArrayState.h            |  5 +++--
 common/JackAtomicState.h                 |  8 ++++----
 common/JackTransportEngine.h             |  1 -
 common/jack/types.h                      |  4 ++--
 macosx/Jackdmp.xcodeproj/project.pbxproj | 14 --------------
 posix/JackCompilerDeps_os.h              |  3 +--
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/common/JackAtomicArrayState.h b/common/JackAtomicArrayState.h
index 29adc592..8a0daf08 100644
--- a/common/JackAtomicArrayState.h
+++ b/common/JackAtomicArrayState.h
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackAtomicArrayState__
 
 #include "JackAtomic.h"
+#include "JackCompilerDeps.h"
 #include <string.h> // for memcpy
 
 namespace Jack
@@ -67,7 +68,7 @@ struct AtomicArrayCounter
         return *this;
     }
     
-};
+} POST_PACKED_STRUCTURE;
 
 #define Counter1(e) (e).info.fLongVal
 #define GetIndex1(e, state) ((e).info.scounter.fByteVal[state])
@@ -247,7 +248,7 @@ class JackAtomicArrayState
             WriteNextStateStopAux(state);
         }
 
-};
+} POST_PACKED_STRUCTURE;
 
 } // end of namespace
 
diff --git a/common/JackAtomicState.h b/common/JackAtomicState.h
index 5dbd1366..eaf164ee 100644
--- a/common/JackAtomicState.h
+++ b/common/JackAtomicState.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackAtomicState__
 
 #include "JackAtomic.h"
+#include "JackCompilerDeps.h"
 #include <string.h> // for memcpy
 
 namespace Jack
@@ -68,7 +69,7 @@ struct AtomicCounter
         return *this;
     }
 
-};
+} POST_PACKED_STRUCTURE;
 
 #define Counter(e) (e).info.fLongVal
 #define CurIndex(e) (e).info.scounter.fShortVal1
@@ -250,11 +251,10 @@ class JackAtomicState
         	} while (cur_index != next_index);
         }
         */
-};
-
+        
+} POST_PACKED_STRUCTURE;
 
 } // end of namespace
 
-
 #endif
 
diff --git a/common/JackTransportEngine.h b/common/JackTransportEngine.h
index 2adac8b1..a1ff2b97 100644
--- a/common/JackTransportEngine.h
+++ b/common/JackTransportEngine.h
@@ -195,7 +195,6 @@ class SERVER_EXPORT JackTransportEngine : public JackAtomicArrayState<jack_posit
 
 } POST_PACKED_STRUCTURE;
 
-
 } // end of namespace
 
 #endif
diff --git a/common/jack/types.h b/common/jack/types.h
index 595dd510..fa65ce5c 100644
--- a/common/jack/types.h
+++ b/common/jack/types.h
@@ -454,6 +454,7 @@ typedef enum {
     JackBBTFrameOffset =      0x40,	/**< Frame offset of BBT information */
     JackAudioVideoRatio =     0x80, /**< audio frames per video frame */
     JackVideoFrameOffset =   0x100  /**< frame offset of first video frame */
+    
 } jack_position_bits_t;
 
 /** all valid position bits */
@@ -641,7 +642,6 @@ typedef struct {
     double ticks_per_beat;
     double beats_per_minute;
 
-}
-jack_transport_info_t;
+} jack_transport_info_t;
 
 #endif /* __jack_types_h__ */
diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj
index 4cb03700..f3071671 100644
--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -509,11 +509,6 @@
 		4BA4ADB50E87AB2600F26C85 /* JackCoreAudioDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FECC0E725C090020B576 /* JackCoreAudioDriver.h */; };
 		4BA692B30CBE4C2D00EAD520 /* ipload.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA692B20CBE4C2D00EAD520 /* ipload.c */; };
 		4BA692D70CBE4CC600EAD520 /* ipunload.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA692D60CBE4CC600EAD520 /* ipunload.c */; };
-		4BA7BDCE0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
-		4BA7BDCF0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
-		4BA7BDD00DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
-		4BA7BDD10DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
-		4BA7BDD20DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		4BA7BE0F0DC232A400AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7BE1A0DC2347500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7BE200DC234FB00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
@@ -643,7 +638,6 @@
 		4BF5FBC90E878D24003D2374 /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
 		4BF5FBCA0E878D24003D2374 /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
 		4BF5FBCB0E878D24003D2374 /* JackMachTime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF5FBC80E878D24003D2374 /* JackMachTime.c */; };
-		4BFA5E920DEC4D9C00FA4CDB /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		4BFA5E9F0DEC4DD900FA4CDB /* testMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */; };
 		4BFA82850DF6A9E40087B4E1 /* evmon.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363E200DEB0401001F72D9 /* evmon.c */; };
 		4BFA82980DF6A9E40087B4E1 /* bufsize.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363E710DEB0808001F72D9 /* bufsize.c */; };
@@ -1389,7 +1383,6 @@
 		4BA692B20CBE4C2D00EAD520 /* ipload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipload.c; path = "../example-clients/ipload.c"; sourceTree = SOURCE_ROOT; };
 		4BA692D40CBE4C9000EAD520 /* jack_unload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_unload; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA692D60CBE4CC600EAD520 /* ipunload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipunload.c; path = "../example-clients/ipunload.c"; sourceTree = SOURCE_ROOT; };
-		4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Jackservermp.framework; path = build/Development/Jackservermp.framework; sourceTree = SOURCE_ROOT; };
 		4BA7FEC30D8E76270017FF73 /* jack_server_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_server_control; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA7FEC80D8E76650017FF73 /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = "../example-clients/control.c"; sourceTree = SOURCE_ROOT; };
 		4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortType.cpp; path = ../common/JackPortType.cpp; sourceTree = SOURCE_ROOT; };
@@ -1903,7 +1896,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BDCE0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1911,7 +1903,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BDCF0DC22F4500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1926,7 +1917,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BDD00DC22F4500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1934,7 +1924,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BDD10DC22F4500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1942,7 +1931,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BDD20DC22F4500AA3457 /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2055,7 +2043,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BFA5E920DEC4D9C00FA4CDB /* Jackservermp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2128,7 +2115,6 @@
 		0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */,
 				4BCC87950D57168300A7FEB1 /* Accelerate.framework */,
 			);
 			name = "External Frameworks and Libraries";
diff --git a/posix/JackCompilerDeps_os.h b/posix/JackCompilerDeps_os.h
index a71ab190..767674e1 100644
--- a/posix/JackCompilerDeps_os.h
+++ b/posix/JackCompilerDeps_os.h
@@ -34,8 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
         #if (__GNUC__< 4)  /* Does not seem to work with GCC 3.XX serie */
             #define POST_PACKED_STRUCTURE
         #elif defined(JACK_32_64)
-            //#define POST_PACKED_STRUCTURE __attribute__((__packed__))
-            #define POST_PACKED_STRUCTURE __attribute__((__aligned__(32)))
+            #define POST_PACKED_STRUCTURE __attribute__((__packed__))
         #else
             #define POST_PACKED_STRUCTURE
         #endif