Merged this branch with the one in the splint.sf.net repository.

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

diff --git a/src/Headers/forwardTypes.h b/src/Headers/forwardTypes.h
index 396363868f1909330aa5f695daf74fc4fedd6aa5..329e7dbb5826d6ea7856389d4f913bfa084b65cd 100644 (file)
--- a/src/Headers/forwardTypes.h
+++ b/src/Headers/forwardTypes.h
@@ -24,7 +24,6 @@ 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;
@@ -72,12 +71,12 @@ abst_typedef sRefSet globSet;
 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;
+abst_typedef /*@notnull@*/ struct s_constraintExpr * constraintExpr;
+
+
 
 /*@-cppnames@*/
 typedef int bool;
@@ -86,10 +85,6 @@ typedef int bool;
 abst_typedef /*@untainted@*/ /*@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 */