client: Unbreak standalone build

[empserver] / include / optlist.h

diff --git a/include/optlist.h b/include/optlist.h
index 7d3e6245060a7d3a346399752ea0fb067f582c6c..cd5153e729ad4ff3cd62df79d1476616d2bbf02e 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,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/>.
  *
  *  ---
  *
@@ -26,10 +25,11 @@
  *  ---
  *
  *  optlist.h: Definitions of option listings
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2010
  */
 
 #ifndef OPTLIST_H
@@ -40,19 +40,20 @@
 extern char dflt_econfig[];
 
 /* Game parameters, can be set in econfig */
-#define        EMP_CONFIG_H_OUTPUT
+#define EMP_CONFIG_H_OUTPUT
 #include "econfig-spec.h"
 #undef EMP_CONFIG_H_OUTPUT
 
 extern char *configdir;
+extern char *builtindir;
+extern char *gamedir;
+extern char *infodir;
+extern char *schedulefil;
 
-extern char *motdfil;
-extern char *downfil;
-extern char *disablefil;
-extern char *annfil;
-extern char *timestampfil;
-extern char *teldir;
-extern char *telfil;
+extern char motdfil[];
+extern char downfil[];
+extern char annfil[];
+extern char teldir[];
 
 enum {
     KM_ALLOC = 1,              /* memory allocated */
@@ -60,9 +61,15 @@ enum {
     KM_OPTION = 4              /* historically an option */
 };
 
+enum {
+    UPD_DEMAND_NONE,           /* no demand updates */
+    UPD_DEMAND_SCHED,          /* scheduled updates are demand updates */
+    UPD_DEMAND_ASYNC           /* zdone triggers unscheduled update */
+};
+
 struct keymatch {
     char *km_key;              /* the key */
-    nsc_type km_type;          /* type of associated data */
+    enum nsc_type km_type;     /* type of associated data */
     void *km_data;             /* pointer to associated data */
     int km_flags;              /* useful flags */
     char *km_comment;          /* Comment (hopefully useful) */