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 056695c8a958aff488295690747a211d13f712e6..36a417bed7e83dde95a7c4a84478902c12e928b3 100644 (file)
--- a/src/Headers/forwardTypes.h
+++ b/src/Headers/forwardTypes.h
@@ -1,12 +1,18 @@
 # 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;
 abst_typedef /*@null@*/ struct s_uentry *uentry;
+typedef struct s_hashNode *hashNode;
 immut_typedef int typeIdSet;
 typedef /*@only@*/ uentry o_uentry;
 abst_typedef struct s_mttok *mttok;
@@ -23,11 +29,18 @@ 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;
 abst_typedef /*@null@*/ struct s_metaStateInfo *metaStateInfo;
 
+abst_typedef /*@null@*/ struct s_functionConstraint *functionConstraint;
+abst_typedef struct s_metaStateConstraint *metaStateConstraint;
+abst_typedef /*@null@*/ struct s_metaStateConstraintList *metaStateConstraintList ;
+abst_typedef struct s_metaStateSpecifier *metaStateSpecifier;
+abst_typedef /*@null@*/ struct s_metaStateExpression *metaStateExpression;
+
 abst_typedef /*@null@*/ struct s_functionClause *functionClause;
 abst_typedef /*@null@*/ struct s_functionClauseList *functionClauseList;
 
@@ -61,23 +74,23 @@ abst_typedef struct s_mtLoseReference *mtLoseReference;
 abst_typedef struct s_mtTransferAction *mtTransferAction;
 abst_typedef sRefSet globSet;
 
-abst_typedef struct s_constraint *constraint;
-abst_typedef struct s_constraintList  *constraintList;
+abst_typedef /*@null@*/ struct s_constraint *constraint;
+abst_typedef /*@null@*/ struct s_constraintList *constraintList;
 
+abst_typedef /*@null@*/ struct s_ctypeList *ctypeList;
+abst_typedef /*@null@*/ ctypeList fileIdList;
 
 /* DRL modified 9 26 00 */
 
-abst_typedef /*@null@*/ struct s_constraintExpr * constraintExpr;
-
-
-
-/*@-cppnames@*/
-typedef int bool;
-/*@=cppnames@*/
+abst_typedef /*@null@*/ struct s_constraintExpr *constraintExpr;
 
 abst_typedef /*@null@*/ char *cstring;
 typedef /*@only@*/ cstring o_cstring;
 
+abst_typedef /*@null@*/ struct s_cstringSList *cstringSList;
+
+typedef enum e_LSLInitRuleCode LSLInitRuleCode;
+
 immut_typedef int ctype;
 
 /* sRef -> bool */