Update copyright notice.

[empserver] / include / misc.h

diff --git a/include/misc.h b/include/misc.h
index 032047fc1279c2acd62169d21bc106900f1de7b1..8fc5d5135873927765b06d591431a5a4e35bf037 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -32,39 +32,35 @@
  *       Doug Hay, 1998
  */
 
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef MISC_H
+#define MISC_H
 
-#include <ctype.h>
-#include <string.h>
-#include <sys/types.h>
+#include <time.h>
+
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
+#ifdef _WIN32
+#ifndef __GNUC__
 
-#if defined(_WIN32)
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
 typedef long ssize_t;
 
 /* integral mismatch, due to misuse of sector short */
 #pragma warning (disable : 4761 )
 
-#include <minmax.h>
-#include <io.h>
+#define strncasecmp(s1, s2, s3) _strnicmp((s1), (s2), (s3))
 
-#define random rand
-#define srandom srand
+typedef int pid_t;
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
 
-#define strncasecmp(s1, s2, s3) _strnicmp(s1, s2, s3)
-#define mkdir(dir,perm) _mkdir(dir)
-/* used for access */
-#define F_OK 0  // FILE existence
-#define W_OK 02 // Write permission
-#define R_OK 04 // Read permission
+#endif /* !__GNUC__ */
 
-/*#define _POSIX_ */
-#endif
+#define mkdir(dir,perm) _mkdir((dir))
+#define random rand
+#define srandom srand
 
-#include "options.h"
+#endif /* _WIN32 */
 
 /* This is the structure we use to keep track of the global mobility
    things, such as when the server is supposed to start/stop updating
@@ -81,40 +77,15 @@ struct mob_acc_globals {
 #define ATTRIBUTE(attrs)
 #endif
 
-/* This uses a lot of thread stack with some versions of GNU libc,
-   which can lead to nasty heap smashes (observed with 2.2.93).
-   Disabled for now, until we readjust thread stack sizes.  */
+/*
+ * This uses a lot of thread stack with some versions of GNU libc,
+ * which can lead to nasty heap smashes (observed with 2.2.93).
+ * Disabled for now, until we readjust thread stack sizes.
+ */
 #if 0
 #define RESOLVE_IPADDRESS      /* resolve ip addresses into hostnames */
 #endif
 
-typedef u_char natid;          /* NSC_NATID must match this */
-
-#if defined(__linux__ ) || defined(__osf__)
-#define POSIXSIGNALS 1
-#endif
-
-#if !defined (_EMPTH_LWP) && !defined (_EMPTH_POSIX)
-#define _EMPTH_LWP     1
-#endif
-
-#if defined(_EMPTH_POSIX) && !defined(POSIXSIGNALS)
-#define POSIXSIGNALS
-#endif
-
-
-#if !defined(aix) && !defined(sgi)
-#ifndef ultrix                 /* already defined in ultrix */
-typedef char s_char;           /* change to signed char for aix */
-#endif /* ultrix */
-#else
-typedef signed char s_char;
-/* gcc __attribute__((format ...)) chokes on s_char * format strings */
-#undef ATTRIBUTE
-#define ATTRIBUTE(attr)
-#endif /* !aix && !sgi */
-typedef short coord;
-
 #ifndef bit
 #define        bit(x)          (1<<(x))
 #endif
@@ -128,11 +99,17 @@ extern int debug;
 /*
  * If EXPR is true, an internal error occured.
  * Return EXPR != 0.
- * Usage: if (CANT_HAPPEN(...)) recovery_code();
+ * Usage: if (CANT_HAPPEN(...)) <recovery code>;
  */
 #define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0)
 
-typedef int (*qsort_func_t) (const void *, const void *);
+/*
+ * Report internal error.
+ * Usage: CANT_REACH(); <recovery code>;
+ */
+#define CANT_REACH() (void)oops(NULL, __FILE__, __LINE__)
+
+extern int oops(char *, char *, int);
 
        /* return codes from command routines */
 #define        RET_OK          0       /* command completed sucessfully */
@@ -140,19 +117,15 @@ typedef int (*qsort_func_t) (const void *, const void *);
 #define        RET_SYN         2       /* syntax error in command */
 #define        RET_SYS         3       /* system error (missing file, etc) */
 
-double dmax(double n1, double n2);
-double dmin(double n1, double n2);
-
-extern s_char *numstr(s_char buf[], int n);
-extern s_char *esplur(int n);
-extern s_char *splur(int n);
-extern s_char *iesplur(int n);
-extern s_char *plur(int n, s_char *no, s_char *yes);
 extern char *getstarg(char *input, char *prompt, char buf[]);
 extern char *getstring(char *prompt, char buf[]);
-extern s_char *prbuf(s_char *format, ...)
+extern char *ugetstring(char *prompt, char buf[]);
+             
+extern char *prbuf(char *format, ...)
     ATTRIBUTE((format (printf, 1, 2)));
 
-#include "prototypes.h"                /* must come at end, after defines and typedefs */
+#define AGREE_FREE     0
+#define AGREE_PROPOSED 1
+#define AGREE_SIGNED   2
 
-#endif /* _MISC_H_ */
+#endif