From: Ron Koenderink Date: Thu, 13 Jul 2006 21:14:16 +0000 (+0000) Subject: [_WIN32, __GNUC__]: Reorganize the include files for WIN32 to X-Git-Tag: v4.3.7~4 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=d413884a376300c3b953f52c07ba4c8c7264f8be [_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. --- diff --git a/include/misc.h b/include/misc.h index c5c7eb93a..bb641113f 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 140a0901a..bf4fa2fec 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 109d477b1..a9fda57e2 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 9ae4972b0..01867acc4 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 76014fbb3..2a8a89176 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 c7b526ed6..3cae34395 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 5876cff58..a269ee64c 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 53d1e52f1..03f489eb1 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 621f204a1..22184d23c 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 7ad016eda..b3628c436 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 3a8192ae3..06d1fbc20 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 cf2204eb3..5d05ee252 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 95af6d43b..67c879dd5 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 f495387a2..389505879 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 b374a7e3e..43b8c3c61 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"