Update copyright notice

[empserver] / include / misc.h

diff --git a/include/misc.h b/include/misc.h
index 6bd9ad3cf9a32c336c3749739a4fc37393b6ce5d..298332927a06c62e691653ebaa57359e01e7dd83 100644 (file)
--- 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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,8 +14,7 @@
  *  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 <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -29,7 +28,8 @@
  *          but have to go somewhere!
  *
  *  Known contributors to this file:
- *       Doug Hay, 1998
+ *     Doug Hay, 1998
+ *     Markus Armbruster, 2004-2014
  */
 
 #ifndef MISC_H
@@ -38,6 +38,9 @@
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
+#define LIMIT_TO(val, min, max) \
+    ((val) < (min) ? (min) : (val) > (max) ? (max) : (val))
+
 #ifdef _WIN32
 #include "w32misc.h"
 #endif /* _WIN32 */
@@ -48,15 +51,6 @@
 #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.
- */
-#if 0
-#define RESOLVE_IPADDRESS      /* resolve ip addresses into hostnames */
-#endif
-
 #ifndef bit
 #define bit(x)         (1<<(x))
 #endif