From 5e5dd08a8dccd017ee2abd76ef13ee979d0d85ed Mon Sep 17 00:00:00 2001
From: Colin McEwan <colin.mcewan@gmail.com>
Date: Thu, 10 Jun 2021 18:21:19 +0100
Subject: [PATCH] Revert "Move fields and pad to meet alignment constraints"

This reverts commit ff631bbbdc2279df05f3a18dd44e8fd68be2e04d.
---
 common/JackAtomicState.h     |  2 +-
 common/JackEngineControl.h   | 11 ++++-------
 common/JackTransportEngine.h |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/common/JackAtomicState.h b/common/JackAtomicState.h
index 4c7f992b..522f8df8 100644
--- a/common/JackAtomicState.h
+++ b/common/JackAtomicState.h
@@ -93,8 +93,8 @@ class JackAtomicState
 
     protected:
 
-        volatile AtomicCounter fCounter;
         T fState[2];
+        volatile AtomicCounter fCounter;
         SInt32 fCallWriteCounter;
 
         UInt32 WriteNextStateStartAux()
diff --git a/common/JackEngineControl.h b/common/JackEngineControl.h
index 78d9a42b..c889425c 100644
--- a/common/JackEngineControl.h
+++ b/common/JackEngineControl.h
@@ -48,14 +48,7 @@ class JackGraphManager;
 PRE_PACKED_STRUCTURE
 struct SERVER_EXPORT JackEngineControl : public JackShmMem
 {
-    // Timer
-    JackFrameTimer fFrameTimer;
-
-    // Padding to align fTransport
-    char padding[ sizeof(UInt32) - sizeof(fFrameTimer) % sizeof(UInt32) ];
-    
     // Shared state
-    JackTransportEngine fTransport;
     jack_nframes_t fBufferSize;
     jack_nframes_t fSampleRate;
     bool fSyncMode;
@@ -71,6 +64,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
     int fClientPriority;
     int fMaxClientPriority;
     char fServerName[JACK_SERVER_NAME_SIZE+1];
+    JackTransportEngine fTransport;
     jack_timer_type_t fClockSource;
     int fDriverNum;
     bool fVerbose;
@@ -91,6 +85,9 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
     UInt64 fComputation;
     UInt64 fConstraint;
 
+    // Timer
+    JackFrameTimer fFrameTimer;
+
 #ifdef JACK_MONITOR
     JackEngineProfiling fProfiler;
 #endif
diff --git a/common/JackTransportEngine.h b/common/JackTransportEngine.h
index 17701c28..e00a3138 100644
--- a/common/JackTransportEngine.h
+++ b/common/JackTransportEngine.h
@@ -101,10 +101,10 @@ class SERVER_EXPORT JackTransportEngine : public JackAtomicArrayState<jack_posit
         jack_time_t fSyncTimeout;
         int fSyncTimeLeft;
         int fTimeBaseMaster;
-        SInt32 fWriteCounter;
         bool fPendingPos;
         bool fNetworkSync;
         bool fConditionnal;
+        SInt32 fWriteCounter;
 
         bool CheckAllRolling(JackClientInterface** table);
         void MakeAllStartingLocating(JackClientInterface** table);