Fixes after removing -unrecogcomments flag for make splintme.

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

diff --git a/src/Headers/forwardTypes.h b/src/Headers/forwardTypes.h
index 73407d6b66b309130635b1e8c73fe862c2afef9b..36a417bed7e83dde95a7c4a84478902c12e928b3 100644 (file)
--- a/src/Headers/forwardTypes.h
+++ b/src/Headers/forwardTypes.h
@@ -1,8 +1,13 @@
 # ifndef FORWARDTYPES_H
 # define FORWARDTYPES_H
 
-# ifndef NOLCL
 # include "lclForwardTypes.h"
+
+# ifdef WIN32
+/* Microsoft doesn't support ISO C99 yet */
+/*@-namechecks@*/
+typedef int bool; 
+/*@=namechecks@*/
 # endif
 
 abst_typedef /*@null@*/ struct s_sRef *sRef;
@@ -24,6 +29,7 @@ abst_typedef /*@null@*/ struct s_genericTable *genericTable;
 abst_typedef /*@null@*/ struct s_annotationInfo *annotationInfo;
 abst_typedef /*@null@*/ struct s_inputStream *inputStream;
 abst_typedef /*@null@*/ struct s_stateValue *stateValue;
+abst_typedef /*@null@*/ struct s_pointers *pointers;
 abst_typedef /*@null@*/ genericTable valueTable;
 abst_typedef /*@null@*/ genericTable metaStateTable;
 abst_typedef /*@null@*/ genericTable annotationTable;
@@ -78,11 +84,7 @@ abst_typedef /*@null@*/ ctypeList fileIdList;
 
 abst_typedef /*@null@*/ struct s_constraintExpr *constraintExpr;
 
-/*@-cppnames@*/
-typedef int bool;
-/*@=cppnames@*/
-
-abst_typedef /*@untainted@*/ /*@null@*/ char *cstring;
+abst_typedef /*@null@*/ char *cstring;
 typedef /*@only@*/ cstring o_cstring;
 
 abst_typedef /*@null@*/ struct s_cstringSList *cstringSList;