From d413884a376300c3b953f52c07ba4c8c7264f8be Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Thu, 13 Jul 2006 21:14:16 +0000 Subject: [PATCH] [_WIN32, __GNUC__]: Reorganize the include files for WIN32 to separate the MinGW environment from the MSVC environment and WIN32 environment. Reorganize the order of the includes so the system files are always loaded first to prevent with misc.h defines. Remove system file includes from misc.h. --- include/misc.h | 22 +++++++++------------- src/lib/commands/add.c | 4 ++++ src/lib/commands/disa.c | 3 +++ src/lib/commands/enab.c | 2 ++ src/lib/commands/new.c | 5 ++++- src/lib/commands/powe.c | 6 +++++- src/lib/commands/turn.c | 2 ++ src/lib/common/file.c | 3 +++ src/lib/common/log.c | 5 ++++- src/lib/common/wantupd.c | 3 +++ src/lib/player/accept.c | 3 +++ src/lib/player/empdis.c | 13 +++++++------ src/lib/player/player.c | 12 ++++++------ src/lib/subs/wu.c | 3 +++ src/lib/update/anno.c | 3 +++ 15 files changed, 61 insertions(+), 28 deletions(-) diff --git a/include/misc.h b/include/misc.h index c5c7eb93..bb641113 100644 --- a/include/misc.h +++ b/include/misc.h @@ -40,30 +40,26 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b)) -#if defined(_WIN32) +#ifdef _WIN32 +#ifndef __GNUC__ + typedef long ssize_t; /* integral mismatch, due to misuse of sector short */ -#ifndef __GNUC__ #pragma warning (disable : 4761 ) -#endif -#include - -#define random rand -#define srandom srand - -#ifdef __GNUC__ -#include -#else #define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3)) -#endif -#define mkdir(dir,perm) _mkdir((dir)) typedef int pid_t; #define vsnprintf _vsnprintf #define snprintf _snprintf +#endif /* !__GNUC__ */ + +#define mkdir(dir,perm) _mkdir((dir)) +#define random rand +#define srandom srand + #endif /* _WIN32 */ /* This is the structure we use to keep track of the global mobility diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c index 140a0901..bf4fa2fe 100644 --- a/src/lib/commands/add.c +++ b/src/lib/commands/add.c @@ -34,6 +34,10 @@ #include #include +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif + #include "commands.h" #include "land.h" #include "optlist.h" diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c index 109d477b..a9fda57e 100644 --- a/src/lib/commands/disa.c +++ b/src/lib/commands/disa.c @@ -33,6 +33,9 @@ #include +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif #include #if !defined(_WIN32) #include diff --git a/src/lib/commands/enab.c b/src/lib/commands/enab.c index 9ae4972b..01867acc 100644 --- a/src/lib/commands/enab.c +++ b/src/lib/commands/enab.c @@ -35,6 +35,8 @@ #if !defined(_WIN32) #include +#elif defined(__GNUC__) +#include #endif #include "commands.h" #include "optlist.h" diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c index 76014fbb..2a8a8917 100644 --- a/src/lib/commands/new.c +++ b/src/lib/commands/new.c @@ -34,7 +34,10 @@ #include #include -#ifndef _WIN32 +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif +#if !defined(_WIN32) #include #endif #include "commands.h" diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c index c7b526ed..3cae3439 100644 --- a/src/lib/commands/powe.c +++ b/src/lib/commands/powe.c @@ -34,7 +34,11 @@ * Markus Armbruster, 2006 */ -#include +#include + +#ifdef _WIN32 +#include +#endif #include "commands.h" #include "item.h" diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c index 5876cff5..a269ee64 100644 --- a/src/lib/commands/turn.c +++ b/src/lib/commands/turn.c @@ -36,6 +36,8 @@ #include #if !defined(_WIN32) #include +#elif defined(__GNUC__) +#include #endif #include "tel.h" #include "commands.h" diff --git a/src/lib/common/file.c b/src/lib/common/file.c index 53d1e52f..03f489eb 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -36,6 +36,9 @@ #include #include +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif #include #include #include diff --git a/src/lib/common/log.c b/src/lib/common/log.c index 621f204a..22184d23 100644 --- a/src/lib/common/log.c +++ b/src/lib/common/log.c @@ -33,7 +33,9 @@ #include -#include "misc.h" +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif #if !defined(_WIN32) #include #endif @@ -41,6 +43,7 @@ #include #include #include +#include "misc.h" #include "optlist.h" #include "player.h" #include "prototypes.h" diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index 7ad016ed..b3628c43 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -35,6 +35,9 @@ #include #include +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif #include #if !defined(_WIN32) #include diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 3a8192ae..06d1fbc2 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -38,6 +38,9 @@ #define WIN32 #include #undef NS_ALL +#ifndef __GNUC__ +#include +#endif #else #include #include diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index cf2204eb..5d05ee25 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -36,6 +36,13 @@ #include #include +#include +#include +#if !defined(_WIN32) +#include +#endif +#include + #include "com.h" #include "empio.h" #include "file.h" @@ -48,12 +55,6 @@ #include "prototypes.h" #include "tel.h" -#include -#include -#if !defined(_WIN32) -#include -#endif -#include #define KEEP_COMMANDS 50 diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 95af6d43..67c879dd 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -32,6 +32,12 @@ */ #include +#if !defined(_WIN32) +#include +#endif +#include +#include +#include #include "com.h" #include "empio.h" @@ -48,12 +54,6 @@ #include "sect.h" #include "tel.h" -#if !defined(_WIN32) -#include -#endif -#include -#include -#include static int command(void); static int status(void); diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c index f495387a..38950587 100644 --- a/src/lib/subs/wu.c +++ b/src/lib/subs/wu.c @@ -33,6 +33,9 @@ #include +#if defined(_WIN32) && !defined(__GNUC__) +#include +#endif #include #include #include diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c index b374a7e3..43b8c3c6 100644 --- a/src/lib/update/anno.c +++ b/src/lib/update/anno.c @@ -36,6 +36,9 @@ #include +#if defined(_WIN32) && defined(__GNUC__) +#include +#endif #include #include #include "tel.h"