X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fmisc.h;h=4c2ca620cdeac6b01d3512cfeb90dd6f176b2a17;hp=65e698f0e53b73f8d0bdcad436c7a4ac405a3479;hb=HEAD;hpb=cbf9d68372a254de616b0edf7b3c57e69cfe64c0
diff --git a/include/misc.h b/include/misc.h
index 65e698f0e..4c2ca620c 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,11 +1,11 @@
/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -14,188 +14,98 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*
* ---
*
- * 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.
*
* ---
*
* misc.h: Misc. definitions which don't really belong anywhere,
* but have to go somewhere!
- *
+ *
* Known contributors to this file:
- * Doug Hay, 1998
+ * Doug Hay, 1998
+ * Markus Armbruster, 2004-2020
*/
-#ifndef _MISC_H_
-#define _MISC_H_
-
-#include
-#include
-#include
-
-#if defined(_WIN32)
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef char *caddr_t;
-typedef unsigned int u_int;
+#ifndef MISC_H
+#define MISC_H
-/* integral mismatch, due to misuse of sector short */
-#pragma warning (disable : 4761 )
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#include
-#include
+#define LIMIT_TO(val, min, max) \
+ ((val) < (min) ? (min) : (val) > (max) ? (max) : (val))
-#define random rand
-#define srandom srand
+#ifdef _WIN32
+#include "w32misc.h"
+#endif /* _WIN32 */
-/*#define _POSIX_ */
-#endif
-
-#include "prototype.h"
-#include "options.h"
-
-/* 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
- mobility and the timestamp of when the game was last up. These
- times are in seconds. */
-struct mob_acc_globals {
- time_t timestamp; /* Last timestamp of when the game was up */
- time_t starttime; /* When we should start updating mobility again. */
-};
-
-#define ANNO_KEEP_DAYS 7 /* Keep announcements around for this many days */
-/* 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; /* also change NSC_NATID in nsc.h */
-
-#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(POSIXSIGNALS) || defined(__STDC__)
-typedef void emp_sig_t;
+#ifdef __GNUC__
+#define ATTRIBUTE(attrs) __attribute__ (attrs)
#else
-typedef int emp_sig_t;
+#define ATTRIBUTE(attrs)
#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;
-#endif /* !aix && !sgi */
-typedef short coord; /* also change NSC_COORD in nsc.h */
-/*
- * watch it; your compiler might not like this.
- * If you think this is bogus, look at /usr/include/struct.h
- */
-#define OFFSET(stype, oset) ((int)(&(((struct stype *)0)->oset)))
-#define SETOFF(sinst, oset) ((s_char *) (sinst) + (oset))
-
#ifndef bit
-#define bit(x) (1<<(x))
+#define bit(x) (1U<<(x))
#endif
#define minutes(x) (60*(x))
#define hours(x) (60*60*(x))
#define days(x) (60*60*24*(x))
-typedef void (*voidfunc) ();
-typedef int (*qsort_func_t) (const void *, const void *);
-
- /* return codes from command routines */
-#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) */
-
-#define MAX_DISTPATH_LEN 10 /* Has to go somewhere */
+/*
+ * If @expr is true, an internal error occured.
+ * Return @expr != 0.
+ * Usage: if (CANT_HAPPEN(...)) ;
+ */
+#define CANT_HAPPEN(expr) ((expr) ? oops(#expr, __FILE__, __LINE__), 1 : 0)
/*
- * references to library functions which aren't related to any
- * particular object, and are of general interest
+ * Report internal error.
+ * Usage: CANT_REACH(); ;
*/
-#if !defined(ALPHA) && !defined(__osf__) && !defined(__linux__) && !defined(_WIN32)
-extern long random();
-#endif
+#define CANT_REACH() oops(NULL, __FILE__, __LINE__)
-double dmax _PROTO((double n1, double n2));
-double dmin _PROTO((double n1, double n2));
+extern void oops(char *, char *, int);
+extern void (*oops_handler)(void);
-extern s_char *numstr _PROTO((s_char buf[], int n));
-extern s_char *esplur _PROTO((int n));
-extern s_char *splur _PROTO((int n));
-extern s_char *iesplur _PROTO((int n));
-extern s_char *plur _PROTO((int n, s_char *no, s_char *yes));
-extern s_char *getstarg
-_PROTO((s_char *input, s_char *prompt, s_char buf[]));
-extern s_char *getstring _PROTO((s_char *prompt, s_char buf[]));
-extern s_char *prbuf(s_char *format, ...);
+/*
+ * Assert constant expression @cond, return 1.
+ * If @cond is zero, force a compilation error.
+ */
+#define BUILD_ASSERT_ONE(cond) \
+ (sizeof(char[1 - 2 * !(cond)]))
/*
- * frequently used libc functions
+ * Assert constant expression @cond.
+ * If @cond is zero, force a compilation error.
*/
+#define BUILD_ASSERT(cond) \
+ ((void)BUILD_ASSERT_ONE(cond))
-#if !defined(_WIN32)
-#if defined(linux)
-#ifndef __STDC__
-extern char *malloc();
-extern char *calloc();
-#endif
-#else
-#if !defined(ALPHA) && !defined(__osf__) && !defined(ultrix) && !defined(hpux) && !defined(FBSD)
-extern char *malloc();
-extern char *calloc();
-#endif
-#endif
-#endif
+/*
+ * Number of elements in ARRAY.
+ */
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
-#if (!defined (aix) && !defined (sgi))
-extern char *ctime();
-extern char *strncpy();
-extern char *strcpy();
-#endif /* !aix && !sgi */
-
-extern time_t time();
-#if !defined(_WIN32)
-#ifdef linux
-#ifndef atof
-extern double atof();
-#endif
-#else
-extern double atof();
-#endif
-#endif
+void exit_nomem(void) ATTRIBUTE((noreturn));
-#if !defined(_WIN32)
-#if !defined (__ppc__) && !defined (hpux) && !defined (aix) && !defined (linux) && !defined(ALPHA) && !defined(__osf__) && !defined(SUN4) && !defined (Rel4) && !(defined (ultrix) && (defined (__STDC__) || defined (__SYSTEMFIVE) || defined (__POSIX)))
-extern char *sprintf();
-#endif /* aix */
-#endif
+ /* return codes from command routines */
+#define RET_OK 0 /* command completed sucessfully */
+#define RET_FAIL 1 /* command completed unsucessfully [?] */
+#define RET_SYN 2 /* syntax error in command */
-#define MAXCHRNV 12
+extern char *getstarg(char *input, char *prompt, char buf[]);
+extern char *getstring(char *prompt, char buf[]);
+extern char *ugetstring(char *prompt, char buf[]);
-#include "prototypes.h" /* must come at end, after defines and typedefs */
+extern char *prbuf(char *format, ...)
+ ATTRIBUTE((format (printf, 1, 2)));
-#endif /* _MISC_H_ */
+#endif