Fix trailing whitespace

[empserver] / include / misc.h

diff --git a/include/misc.h b/include/misc.h
index 0e5ede0b8b6154f108404e9c3202f6adf31c5ed6..758a6e78864f105ba979b14b60530a54ca49dbfd 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  *
  *  misc.h: Misc. definitions which don't really belong anywhere,
  *          but have to go somewhere!
- * 
+ *
  *  Known contributors to this file:
  *       Doug Hay, 1998
  */
@@ -39,41 +39,7 @@
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 #ifdef _WIN32
-#ifndef __GNUC__
-
-typedef long ssize_t;
-
-/* integral mismatch, due to misuse of sector short */
-#pragma warning (disable : 4761 )
-
-#define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3))
-
-typedef int pid_t;
-#define vsnprintf _vsnprintf
-#define snprintf _snprintf
-
-#endif /* !__GNUC__ */
-
-#define random rand
-#define srandom srand
-#ifndef S_IRUSR
-#define S_IRUSR            _S_IREAD
-#define S_IWUSR            _S_IWRITE
-#define S_IXUSR            _S_IEXEC
-#define S_IRWXU            S_IRUSR | S_IWUSR | S_IXUSR
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP            0
-#define S_IWGRP            0
-#define S_IXGRP            0
-#define S_IRWXG            S_IRGRP | S_IWGRP | S_IXGRP
-#endif
-#ifndef S_IROTH
-#define S_IROTH            0
-#define S_IWOTH            0
-#define S_IXOTH            0
-#define S_IRWXO            S_IROTH | S_IWOTH | S_IXOTH
-#endif
+#include "w32misc.h"
 #endif /* _WIN32 */
 
 #ifndef S_IRWUG
@@ -103,8 +69,6 @@ typedef int pid_t;
 #define hours(x)       (60*60*(x))
 #define days(x)                (60*60*24*(x))
 
-extern int debug;
-
 /*
  * If EXPR is true, an internal error occured.
  * Return EXPR != 0.
@@ -119,6 +83,7 @@ extern int debug;
 #define CANT_REACH() (void)oops(NULL, __FILE__, __LINE__)
 
 extern int oops(char *, char *, int);
+extern void (*oops_handler)(void);
 
 void exit_nomem(void) ATTRIBUTE((noreturn));
 
@@ -126,12 +91,11 @@ void exit_nomem(void) ATTRIBUTE((noreturn));
 #define        RET_OK          0       /* command completed sucessfully */
 #define        RET_FAIL        1       /* command completed unsucessfully [?] */
 #define        RET_SYN         2       /* syntax error in command */
-#define        RET_SYS         3       /* system error (missing file, etc) */
 
 extern char *getstarg(char *input, char *prompt, char buf[]);
 extern char *getstring(char *prompt, char buf[]);
 extern char *ugetstring(char *prompt, char buf[]);
-             
+
 extern char *prbuf(char *format, ...)
     ATTRIBUTE((format (printf, 1, 2)));