From 51e906ed0e4e67ff7b059077ccaa90206abd097d Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 9 Aug 2017 21:36:10 +0000
Subject: [PATCH] STACKED added to remove some segfaults on x86_64.

git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54849 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 scout/source/classes/scout_commodity.c    |  4 ++--
 scout/source/classes/scout_flags.c        | 12 ++++++------
 scout/source/classes/scout_functions.c    |  8 ++++----
 scout/source/classes/scout_parentwindow.c |  8 ++++----
 scout/source/classes/scout_signal.c       |  6 +++---
 scout/source/classes/scout_vectors.c      |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/scout/source/classes/scout_commodity.c b/scout/source/classes/scout_commodity.c
index a330510e0..e0d9a4606 100755
--- a/scout/source/classes/scout_commodity.c
+++ b/scout/source/classes/scout_commodity.c
@@ -49,8 +49,8 @@ struct CxCallbackUserData {
 };
 
 struct MUIP_CommoditiesWin_CxCommand {
-    ULONG method;
-    UBYTE *command;
+    STACKED ULONG method;
+    STACKED UBYTE *command;
 };
 
 HOOKPROTONHNO(cxlist_con2func, IPTR, struct NList_ConstructMessage *msg)
diff --git a/scout/source/classes/scout_flags.c b/scout/source/classes/scout_flags.c
index 7b797e0ad..63d919937 100755
--- a/scout/source/classes/scout_flags.c
+++ b/scout/source/classes/scout_flags.c
@@ -33,12 +33,12 @@ struct FlagsWinData {
 };
 
 struct MUIP_FlagsWin_ShowFlagsMessage {
-    ULONG MethodID;
-    ULONG value;
-    ULONG type;
-    void *bitarray;
-    void *maskarray;
-    UBYTE *title;
+    STACKED ULONG MethodID;
+    STACKED ULONG value;
+    STACKED ULONG type;
+    STACKED void *bitarray;
+    STACKED void *maskarray;
+    STACKED UBYTE *title;
 };
 
 struct FlagsEntry {
diff --git a/scout/source/classes/scout_functions.c b/scout/source/classes/scout_functions.c
index a86cf980c..0eb99ffa0 100755
--- a/scout/source/classes/scout_functions.c
+++ b/scout/source/classes/scout_functions.c
@@ -35,10 +35,10 @@ struct FunctionsWinData {
 };
 
 struct MUIP_FunctionsWin_ShowFunctionsMessage {
-    ULONG MethodID;
-    ULONG nodeType;
-    APTR base;
-    STRPTR name;
+    STACKED ULONG MethodID;
+    STACKED ULONG nodeType;
+    STACKED APTR base;
+    STACKED STRPTR name;
 };
 
 struct FunctionsEntry {
diff --git a/scout/source/classes/scout_parentwindow.c b/scout/source/classes/scout_parentwindow.c
index deb39d43c..0d410a549 100755
--- a/scout/source/classes/scout_parentwindow.c
+++ b/scout/source/classes/scout_parentwindow.c
@@ -40,13 +40,13 @@ struct ChildWindowNode {
 };
 
 struct MUIP_AddChildWindowMessage {
-    ULONG MethodID;
-    APTR window;
+    STACKED ULONG MethodID;
+    STACKED APTR window;
 };
 
 struct MUIP_RemChildWindowMessage {
-    ULONG MethodID;
-    APTR window;
+    STACKED ULONG MethodID;
+    STACKED APTR window;
 };
 
 STATIC void CloseChildWindow( struct ParentWinData *pwd,
diff --git a/scout/source/classes/scout_signal.c b/scout/source/classes/scout_signal.c
index c2d5f3803..f74b22660 100755
--- a/scout/source/classes/scout_signal.c
+++ b/scout/source/classes/scout_signal.c
@@ -34,11 +34,11 @@ struct SignalWinData {
     APTR swd_OkButton;
 };
 
-struct MUIP_SignalWin_GetSignals { ULONG methodID; STRPTR objname; ULONG *signals; };
+struct MUIP_SignalWin_GetSignals { STACKED ULONG methodID; STACKED STRPTR objname; STACKED ULONG *signals; };
 
-struct MUIP_SigBitChanged { ULONG whichbit; ULONG state; };
+struct MUIP_SigBitChanged { STACKED ULONG whichbit; STACKED ULONG state; };
 
-struct MUIP_SigStrChanged { UBYTE str; };
+struct MUIP_SigStrChanged { STACKED UBYTE str; };
 
 HOOKPROTONH(hex_editfunc, ULONG, struct SGWork *sgw, IPTR *msg)
 {
diff --git a/scout/source/classes/scout_vectors.c b/scout/source/classes/scout_vectors.c
index 9c30e0d7b..4ec4f8005 100755
--- a/scout/source/classes/scout_vectors.c
+++ b/scout/source/classes/scout_vectors.c
@@ -39,8 +39,8 @@ struct VectorsCallbackUserData {
 };
 
 struct MUIP_VectorsWin_Disassemble {
-    ULONG methodID;
-    APTR button;
+    STACKED ULONG methodID;
+    STACKED APTR button;
 };
 
 void ClearResetVectors( void )
-- 
2.11.4.GIT