From: evans1629 <evans1629>
Date: Sun, 20 Apr 2003 22:55:04 +0000 (+0000)
Subject: Fixed inclusion problems with osd.h.
X-Git-Tag: splint-3_1_0~10
X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/8b63eb37025fe1afe1fe4d0160387db50fd77194

Fixed inclusion problems with osd.h.
---

diff --git a/src/Headers/osd.h b/src/Headers/osd.h
index 1f176b9..0e02f74 100644
--- a/src/Headers/osd.h
+++ b/src/Headers/osd.h
@@ -203,11 +203,7 @@ extern int /*pid_t*/ osd_getPid (void) ;
 # else
 # error "Multiple include"
 # endif
-
-
-# else
-# error "Multiple include"
-# endif
+\
 
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ead43f6..1cc81f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,7 @@ GRAMSRC = cgrammar.c cscanner.c mtscanner.c mtgrammar.c llgrammar.c signature.c
 OVERFLOWCHSRC = constraintList.c constraintResolve.c \
                 constraintGeneration.c constraintTerm.c \
                 constraintExprData.c constraintExpr.c constraint.c \
-                constraintOutput.c loopHeuristics.c 
+                loopHeuristics.c 
 
 GENERALSRC = exprData.c cstring.c fileloc.c message.c inputStream.c \
              fileTable.c cstringTable.c valueTable.c stateValue.c \
@@ -334,7 +334,7 @@ Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.y
 	  $(CP) mtgrammar.c.der mtgrammar.c; \
 	else \
 	  echo '* Making mtgrammar.c'; \
-	  echo '*      Note: Expect 11 shift/reduce conflicts.'; \
+	  echo '*       Note: Expect 11 shift/reduce conflicts.'; \
 	  $(BISON) $(YFLAGS) -p mt mtgrammar.y; \
 	  $(CAT) bison.head mtgrammar.tab.c bison.reset >mtgrammar.c; \
 	  $(CP) mtgrammar.c mtgrammar.c.der; \
@@ -350,7 +350,7 @@ Headers/llgrammar_gen.h Headers/llgrammar_gen2.h llgrammar.c: llgrammar.c.der ll
 	  $(CP) llgrammar.c.der llgrammar.c; \
 	else \
 	  echo '* Making llgrammar.c'; \
-	  echo '*      Note: Expect 2 shift/reduce conflicts'; \
+	  echo '*       Note: Expect 2 shift/reduce conflicts'; \
 	  $(BISON) $(YFLAGS) -p yl llgrammar.y; \
 	  $(CAT) bison.head llgrammar.tab.c bison.reset >llgrammar.c; \
 	  $(CP) llgrammar.c llgrammar.c.der; \
diff --git a/src/Makefile.in b/src/Makefile.in
index e32509e..caa0c44 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -145,7 +145,7 @@ GRAMSRC = cgrammar.c cscanner.c mtscanner.c mtgrammar.c llgrammar.c signature.c
 OVERFLOWCHSRC = constraintList.c constraintResolve.c \
                 constraintGeneration.c constraintTerm.c \
                 constraintExprData.c constraintExpr.c constraint.c \
-                constraintOutput.c loopHeuristics.c 
+                loopHeuristics.c 
 
 
 GENERALSRC = exprData.c cstring.c fileloc.c message.c inputStream.c \
@@ -476,8 +476,7 @@ am__objects_17 = exprNode.$(OBJEXT) exprChecks.$(OBJEXT) \
 am__objects_18 = constraintList.$(OBJEXT) constraintResolve.$(OBJEXT) \
 	constraintGeneration.$(OBJEXT) constraintTerm.$(OBJEXT) \
 	constraintExprData.$(OBJEXT) constraintExpr.$(OBJEXT) \
-	constraint.$(OBJEXT) constraintOutput.$(OBJEXT) \
-	loopHeuristics.$(OBJEXT)
+	constraint.$(OBJEXT) loopHeuristics.$(OBJEXT)
 am__objects_19 =
 am__objects_20 = $(am__objects_19)
 am__objects_21 = $(am__objects_7) $(am__objects_16) $(am__objects_17) \
@@ -505,7 +504,6 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/constraintExprData.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/constraintGeneration.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/constraintList.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/constraintOutput.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/constraintResolve.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/constraintTerm.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/context.Po ./$(DEPDIR)/cpperror.Po \
@@ -694,7 +692,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintExprData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintGeneration.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintList.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintOutput.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintResolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraintTerm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context.Po@am__quote@
@@ -1073,7 +1070,7 @@ Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.y
 	  $(CP) mtgrammar.c.der mtgrammar.c; \
 	else \
 	  echo '* Making mtgrammar.c'; \
-	  echo '*      Note: Expect 11 shift/reduce conflicts.'; \
+	  echo '*       Note: Expect 11 shift/reduce conflicts.'; \
 	  $(BISON) $(YFLAGS) -p mt mtgrammar.y; \
 	  $(CAT) bison.head mtgrammar.tab.c bison.reset >mtgrammar.c; \
 	  $(CP) mtgrammar.c mtgrammar.c.der; \
@@ -1087,7 +1084,7 @@ Headers/llgrammar_gen.h Headers/llgrammar_gen2.h llgrammar.c: llgrammar.c.der ll
 	  $(CP) llgrammar.c.der llgrammar.c; \
 	else \
 	  echo '* Making llgrammar.c'; \
-	  echo '*      Note: Expect 2 shift/reduce conflicts'; \
+	  echo '*       Note: Expect 2 shift/reduce conflicts'; \
 	  $(BISON) $(YFLAGS) -p yl llgrammar.y; \
 	  $(CAT) bison.head llgrammar.tab.c bison.reset >llgrammar.c; \
 	  $(CP) llgrammar.c llgrammar.c.der; \
diff --git a/src/context.c b/src/context.c
index fa1d64d..cc317ba 100644
--- a/src/context.c
+++ b/src/context.c
@@ -42,7 +42,6 @@
 # include "llmain.h"
 # include "intSet.h"
 # include "osd.h"
-# include "portab.h"
 
 extern /*@external@*/ int yydebug;
 extern /*@external@*/ int mtdebug;
diff --git a/src/cpplib.c b/src/cpplib.c
index d1534ad..09d9d10 100644
--- a/src/cpplib.c
+++ b/src/cpplib.c
@@ -100,7 +100,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # include "cpphash.h"
 # include "cppexp.h"
 # include "version.h"
-# include "portab.h"
 # include "osd.h"
 
 /*
diff --git a/src/cscannerHelp.c b/src/cscannerHelp.c
index 3d325d2..e5c6e51 100644
--- a/src/cscannerHelp.c
+++ b/src/cscannerHelp.c
@@ -33,7 +33,7 @@
 # include "cscannerHelp.h"
 # include "cscanner.h"
 # include "cgrammar_tokens.h"
-# include "portab.h"
+# include "osd.h"
 
 static int lminput (void);
 static int s_tokLength = 0;
diff --git a/src/cstring.c b/src/cstring.c
index 90d0c17..eeb5f2b 100644
--- a/src/cstring.c
+++ b/src/cstring.c
@@ -34,7 +34,6 @@
 # include "splintMacros.nf"
 # include "basic.h"
 # include "osd.h"
-# include "portab.h"
 
 /*@only@*/ /*@notnull@*/ 
 cstring cstring_newEmpty (void)
diff --git a/src/fileLib.c b/src/fileLib.c
index ec108b0..fece625 100644
--- a/src/fileLib.c
+++ b/src/fileLib.c
@@ -27,7 +27,7 @@
 
 # include "splintMacros.nf"
 # include "basic.h"
-# include "portab.h"
+# include "osd.h"
 
 bool
 fileLib_isCExtension (cstring ext)
diff --git a/src/fileTable.c b/src/fileTable.c
index ffec6d2..01291f0 100644
--- a/src/fileTable.c
+++ b/src/fileTable.c
@@ -51,7 +51,6 @@
 # include "basic.h"
 # include "osd.h"
 # include "llmain.h"
-# include "portab.h"
 
 # ifdef WIN32
 # include <io.h>
diff --git a/src/flags.c b/src/flags.c
index b9874fe..a148f56 100644
--- a/src/flags.c
+++ b/src/flags.c
@@ -28,7 +28,6 @@
 # include "splintMacros.nf"
 # include "basic.h"
 # include "osd.h"
-# include "portab.h"
 # include "rcfiles.h"
 # include "lslinit.h"
 # include "llmain.h"
diff --git a/src/help.c b/src/help.c
index c467995..a1f5ed5 100644
--- a/src/help.c
+++ b/src/help.c
@@ -29,7 +29,6 @@
 # include "basic.h"
 # include "help.h"
 # include "osd.h"
-# include "portab.h"
 # include "llmain.h"
 # include "version.h"
 
diff --git a/src/inputStream.c b/src/inputStream.c
index 70931d0..d2d341e 100644
--- a/src/inputStream.c
+++ b/src/inputStream.c
@@ -47,7 +47,6 @@
 # include "splintMacros.nf"
 # include "basic.h"
 # include "osd.h"
-# include "portab.h"
 
 extern bool
 inputStream_close (inputStream s)