ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Solaris redefines ERR and CS, fixed occurances. 

Solaris has TRAPNO in its sigcontext, added to sig_context.h
This commit is contained in:
Marcus Meissner 1998-11-06 16:30:41 +00:00 committed by Alexandre Julliard
parent 46b68f091c
commit e0e248eaee
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
if1632/thunk.c
View File

@ -19,8 +19,8 @@
#include "task.h" #include "task.h"
#include "except.h" #include "except.h"
#include "win.h" #include "win.h"
#include "debug.h"
#include "flatthunk.h" #include "flatthunk.h"
#include "debug.h"
/* List of the 16-bit callback functions. This list is used */ /* List of the 16-bit callback functions. This list is used */
@ -706,7 +706,7 @@ UINT32 WINAPI ThunkConnect16(
DWORD dwReason, /* [in] initialisation argument */ DWORD dwReason, /* [in] initialisation argument */
struct ThunkDataCommon *TD, /* [in/out] thunkbuffer */ struct ThunkDataCommon *TD, /* [in/out] thunkbuffer */
LPSTR thunkfun32, /* [in] win32 thunkfunction */ LPSTR thunkfun32, /* [in] win32 thunkfunction */
WORD CS /* [in] CS of win16 dll */ WORD cs /* [in] CS of win16 dll */
) { ) {
BOOL32 directionSL; BOOL32 directionSL;

2
include/debugtools.h
View File

@ -59,6 +59,8 @@ extern short debug_msg_enabled[][DEBUG_CLASS_COUNT];
#endif /* NO_DEBUG_MSGS */ #endif /* NO_DEBUG_MSGS */
/* define error macro regardless of what is configured */ /* 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 ERR(ch, fmt, args...) DPRINTF_(err, ch, fmt, ## args)
#define MSG(format, args...) fprintf(stderr, format, ## args) #define MSG(format, args...) fprintf(stderr, format, ## args)

3
include/sig_context.h
View File

@ -168,6 +168,9 @@ typedef struct _CONTEXT /* Note 1 */
#else #else
#define ESP_sig(context) ((context)->uc_mcontext.gregs[ESP]) #define ESP_sig(context) ((context)->uc_mcontext.gregs[ESP])
#endif #endif
#ifdef TRAPNO
#define TRAP_sig(context) ((context)->uc_mcontext.gregs[TRAPNO])
#endif
#endif /* svr4 || SCO_DS */ #endif /* svr4 || SCO_DS */

2
multimedia/mmsystem.c
View File

@ -30,11 +30,11 @@
#include "file.h" #include "file.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "multimedia.h" #include "multimedia.h"
#include "debug.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "callback.h" #include "callback.h"
#include "module.h" #include "module.h"
#include "selectors.h" #include "selectors.h"
#include "debug.h"
int mciInstalledCount; int mciInstalledCount;
int mciInstalledListLen; int mciInstalledListLen;

2
scheduler/handle.c
View File

@ -6,13 +6,13 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "debug.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "process.h" #include "process.h"
#include "server.h" #include "server.h"
#include "thread.h" #include "thread.h"
#include "debug.h"
#define HTABLE_SIZE 0x30 /* Handle table initial size */ #define HTABLE_SIZE 0x30 /* Handle table initial size */
#define HTABLE_INC 0x10 /* Handle table increment */ #define HTABLE_INC 0x10 /* Handle table increment */