More bool conversions

[solanum.git] / include / stdinc.h

diff --git a/include/stdinc.h b/include/stdinc.h
index 30331e9e904c66bd1c253712d95695e125fe4ae8..9a32e5cec91fcc58f825fc16a1f4cbff9dc1623c 100644 (file)
--- a/include/stdinc.h
+++ b/include/stdinc.h
@@ -19,14 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- * $Id: stdinc.h 6 2005-09-10 01:02:21Z nenolod $
- *
  */
 
-#include "ratbox_lib.h"
+#include "rb_lib.h"
 #include "config.h"            /* Gotta pull in the autoconf stuff */
 #include "ircd_defs.h"  /* Needed for some reasons here -- dwr */
-#include "irc_dictionary.h"
 
 /* AIX requires this to be the first thing in the file.  */
 #ifdef __GNUC__
@@ -50,7 +47,7 @@ char *alloca ();
 #  endif
 # endif
 #endif
- 
+
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -74,6 +71,22 @@ char *alloca ();
 #endif
 
 
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# ifndef HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif
+
 
 #include <stdio.h>
 #include <assert.h>
@@ -144,7 +157,7 @@ extern int errno;
 
 
 #ifdef strdupa
-#define LOCAL_COPY(s) strdupa(s) 
+#define LOCAL_COPY(s) strdupa(s)
 #else
 #if defined(__INTEL_COMPILER) || defined(__GNUC__)
 # define LOCAL_COPY(s) __extension__({ char *_s = alloca(strlen(s) + 1); strcpy(_s, s); _s; })