Fixed problem with NULL being changed.

[splint.git] / src / Headers / basic.h

diff --git a/src/Headers/basic.h b/src/Headers/basic.h
index 7021592b7d79b972e2e4ba9041013762001c6e5d..7f843ad227c1d3cfa79dda8f8db0fe3344f2169b 100644 (file)
--- a/src/Headers/basic.h
+++ b/src/Headers/basic.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -8,20 +8,45 @@
 # define BASIC_H
 
 # ifdef HAVE_CONFIG_H
-# include "config.h"
+# ifdef WIN32
+/* BCC32 Contributed by Scott Frazer */
+# ifdef BCC32
+# include "../../bcc32/bcc32_config.h"
+# else
+/* Win32 uses its own hand-generated config file */
+# include "../../winconfig.h"
+# endif 
+# else 
+# include "../../config.h"
+# endif
+# else
+# error "No config.h file!"
 # endif
 
 # include <stdlib.h>
 # include <stdio.h>
+
+# if !defined (WIN32) &&  !(defined (OS2) && defined (__IBMC__))
+/* Microsoft VC++ still doesn't support ISO C99... */
+# include <stdbool.h>
+# endif
+
+#if defined (OS2) && defined (__IBMC__)
+extern int snprintf (char *str, size_t count, const char *fmt, ...);
+#endif
+
 # include <string.h>
 # include <ctype.h>
 # include <float.h>
+# include <limits.h>
 # include "general.h"
 # include "ynm.h"
 # include "message.h" 
 # include "fileloc.h"
 # include "globals.h"
 # include "cpp.h"
+# include "cstringSList.h"
+# include "cstringList.h"
 # include "flag_codes.h"
 # include "flags.h"
 # include "flagSpec.h"
@@ -33,14 +58,11 @@
 # include "warnClause.h"
 # include "functionClause.h"
 # include "functionClauseList.h"
-# include "cstringSList.h"
-# include "cstringList.h"
 # include "llerror.h" 
 # include "fileLib.h"
 # include "inputStream.h"
 # include "qualList.h"
-
-# ifndef NOLCL
+# include "pointers.h"
 # include "code.h"
 # include "mapping.h"
 # include "sort.h"
@@ -50,8 +72,6 @@
 # include "lsymbol.h"
 # include "abstract.h"
 # include "symtable.h"
-# endif
-
 # include "exprNodeList.h"
 # include "cprim.h"
 # include "cstringTable.h"
@@ -62,6 +82,8 @@
 # include "varKinds.h"
 # include "sRefSet.h"
 # include "ekind.h"
+# include "usymId.h"
+# include "typeId.h"
 # include "usymIdSet.h"
 # include "sRefList.h"
 # include "uentryList.h"
@@ -102,9 +124,10 @@
 # include "stateCombinationTable.h"
 # include "mtincludes.h"
 # include "functionConstraint.h"
-
+# include "fileIdList.h"
 # include "context.h"
 # include "constants.h"
+# include "llglobals.h"
 
 # else
 # error "Multiple include"