COPYING duplicates information from README. Remove. Move GPL from

[empserver] / include / misc.h

diff --git a/include/misc.h b/include/misc.h
index a3de937f02e334e98874bee215d9764cc907255d..5795adc0cf3297999288fa0a48291831e1e0f3fb 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-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, 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,13 +32,16 @@
  *       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>
 
+#define MAX(a,b) (a > b ? a : b)
+#define MIN(a,b) (a < b ? a : b)
+
 #if defined(_WIN32)
 typedef unsigned char u_char;
 typedef unsigned short u_short;
@@ -46,28 +49,31 @@ typedef unsigned int u_int;
 typedef long ssize_t;
 
 /* integral mismatch, due to misuse of sector short */
+#ifndef __GNUC__
 #pragma warning (disable : 4761 )
+#endif
 
-#include <minmax.h>
 #include <io.h>
 
 #define random rand
 #define srandom srand
 
 #define strncasecmp(s1, s2, s3) _strnicmp(s1, s2, s3)
-#define mkdir(dir,perm) _mkdir(dir)
-/* used for access */
+#define mkdir(dir,perm) _mkdir((dir))
+#ifndef F_OK
 #define F_OK 0  /* FILE existence */
+#endif
+#ifndef W_OK
 #define W_OK 02 /* Write permission */
+#endif
+#ifndef R_OK
 #define R_OK 04 /* Read permission */
+#endif
 
 typedef int pid_t;
 #define vsnprintf _vsnprintf
 
-/*#define _POSIX_ */
-#endif
-
-#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
@@ -93,21 +99,16 @@ struct mob_acc_globals {
 
 typedef u_char natid;          /* NSC_NATID must match this */
 
-#if !defined (_EMPTH_LWP) && !defined (_EMPTH_POSIX)
-#define _EMPTH_LWP     1
+/*
+ * TODO s_char has to go.  Use plain char for characters and strings,
+ * signed char for small integers.
+ */
+#ifdef __CHAR_UNSIGNED__
+typedef signed char s_char;
+#else
+typedef char s_char;
 #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
@@ -127,6 +128,7 @@ extern int daemonize;
  * Usage: if (CANT_HAPPEN(...)) recovery_code();
  */
 #define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__) : 0)
+extern int oops(char *, char *, int);
 
        /* return codes from command routines */
 #define        RET_OK          0       /* command completed sucessfully */
@@ -134,19 +136,15 @@ extern int daemonize;
 #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 char *ugetstring(char *prompt, char buf[]);
              
-extern s_char *prbuf(s_char *format, ...)
+extern char *prbuf(char *format, ...)
     ATTRIBUTE((format (printf, 1, 2)));
 
-#endif /* _MISC_H_ */
+#define AGREE_FREE     0
+#define AGREE_PROPOSED 1
+#define AGREE_SIGNED   2
+
+#endif