From e0e248eaee8865dae8ef5402c50993c1f8f87f5e Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Fri, 6 Nov 1998 16:30:41 +0000
Subject: [PATCH] Solaris redefines ERR and CS, fixed occurances. Solaris has
 TRAPNO in its sigcontext, added to sig_context.h

---
 if1632/thunk.c        | 4 ++--
 include/debugtools.h  | 2 ++
 include/sig_context.h | 3 +++
 multimedia/mmsystem.c | 2 +-
 scheduler/handle.c    | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/if1632/thunk.c b/if1632/thunk.c
index 2ac70aabef1..9060ceed5e3 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -19,8 +19,8 @@
 #include "task.h"
 #include "except.h"
 #include "win.h"
-#include "debug.h"
 #include "flatthunk.h"
+#include "debug.h"
 
 
 /* List of the 16-bit callback functions. This list is used  */
@@ -706,7 +706,7 @@ UINT32 WINAPI ThunkConnect16(
         DWORD dwReason,              /* [in] initialisation argument */
         struct ThunkDataCommon *TD,  /* [in/out] thunkbuffer */
         LPSTR thunkfun32,            /* [in] win32 thunkfunction */
-        WORD CS                      /* [in] CS of win16 dll */
+        WORD cs                      /* [in] CS of win16 dll */
 ) {
     BOOL32 directionSL;
 
diff --git a/include/debugtools.h b/include/debugtools.h
index 6bb535860fa..42167537999 100644
--- a/include/debugtools.h
+++ b/include/debugtools.h
@@ -59,6 +59,8 @@ extern short debug_msg_enabled[][DEBUG_CLASS_COUNT];
 #endif /* NO_DEBUG_MSGS */
 
 /* define error macro regardless of what is configured */
+/* Solaris got an 'ERR' define in <sys/reg.h> */
+#undef ERR
 #define ERR(ch, fmt, args...)   DPRINTF_(err, ch, fmt, ## args)
 #define MSG(format, args...)    fprintf(stderr, format, ## args)
 
diff --git a/include/sig_context.h b/include/sig_context.h
index ad9d192d9b7..c8ea5d4bc10 100644
--- a/include/sig_context.h
+++ b/include/sig_context.h
@@ -168,6 +168,9 @@ typedef struct _CONTEXT		/* Note 1 */
 #else
 #define ESP_sig(context)     ((context)->uc_mcontext.gregs[ESP])
 #endif
+#ifdef TRAPNO
+#define TRAP_sig(context)     ((context)->uc_mcontext.gregs[TRAPNO])
+#endif
 
 #endif  /* svr4 || SCO_DS */
                             
diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c
index c1711468474..d8fd86c6b70 100644
--- a/multimedia/mmsystem.c
+++ b/multimedia/mmsystem.c
@@ -30,11 +30,11 @@
 #include "file.h"
 #include "mmsystem.h"
 #include "multimedia.h"
-#include "debug.h"
 #include "xmalloc.h"
 #include "callback.h"
 #include "module.h"
 #include "selectors.h"
+#include "debug.h"
 
 int	mciInstalledCount;
 int	mciInstalledListLen;
diff --git a/scheduler/handle.c b/scheduler/handle.c
index 08c8401dc47..5abf0a65022 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -6,13 +6,13 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "debug.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "heap.h"
 #include "process.h"
 #include "server.h"
 #include "thread.h"
+#include "debug.h"
 
 #define HTABLE_SIZE  0x30  /* Handle table initial size */
 #define HTABLE_INC   0x10  /* Handle table increment */