--- deliantra/server/include/global.h	2007/04/17 18:24:30	1.53
+++ deliantra/server/include/global.h	2007/05/07 04:21:11	1.58
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -51,6 +51,12 @@
 #define ACC(meta,member) member
 #define MTH
 
+#if __GNUC__ >= 3
+# define attribute(attrlist) __attribute__(attrlist)
+#else
+# define attribute(attrlist)
+#endif
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
@@ -66,6 +72,7 @@
 #include "material.h"
 #include "living.h"
 #include "object.h"
+#include "region.h"
 #include "map.h"
 #include "tod.h"
 
@@ -126,12 +133,10 @@
  * Variables set by different flags (see init.c):
  */
 
-EXTERN bool warn_archetypes;	/* If true, write warnings when failing */
-                                /* to find archetypes when loading from file */
 EXTERN bool init_done;		/* Ignores signals until init_done is true */
 EXTERN bool in_cleanup;		/* True when cleanup() is reached */
 
-extern long pticks;		/* used by various function to determine */
+extern tick_t pticks;		/* used by various function to determine */
                                 /* how often to save the character */
 /*
  * Misc global variables:
@@ -241,6 +246,8 @@
 
 extern Settings settings;
 
+void reset_signals ();
+
 #include "plugin.h"
 #include "cfperl.h"