Fixed inclusion problems with osd.h.

diff --git a/src/Headers/osd.h b/src/Headers/osd.h
index 1f176b9a04274b2c7b8c9d8947c66dfabf90b7ac..0e02f748183b19016263b26aa1ef38129f3f2c2a 100644 (file)
--- 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 ead43f6112004748da9dd04751301d530752fad8..1cc81f32f39628dfed250febbd6d07ad0d677b10 100644 (file)
--- 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 e32509e6f2f33044dffa5fc5e7e0804840c1e514..caa0c441601afc41ec8652f45f4089f531ebdd63 100644 (file)
--- 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 fa1d64d4a0c3950557acca24cef93fb4c42b70e5..cc317ba1b6087197761cda7499dbc8a802382390 100644 (file)
--- 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 d1534ad455e0fd0379e0670e4e4f5938abc20a33..09d9d103456339a4d76fa6de26c7eab316b7211b 100644 (file)
--- 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 3d325d2021c4659575440af931a848c24a178c0d..e5c6e51c0e77fe4d21716f40544c5248ff7073fd 100644 (file)
--- 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 90d0c17b20d2d965e9b8293570cb40591e62308b..eeb5f2b89b497ee8b144cb68b3c7dc039dfe4e02 100644 (file)
--- 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 ec108b020e51e8c2119a72149b73a2ea0ef8a41b..fece625b0be08299eafbff4c5d7960056ac2a5d2 100644 (file)
--- 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 ffec6d2530f2585641b2cc238e40cfc264114a43..01291f094d3f20860ca6da9f0aa047bed80ef9bb 100644 (file)
--- 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 b9874fe18e1290c8f01b07f45262effbeaaeb334..a148f56d3040bd5a9020c3d12ba08c5a9a6b7093 100644 (file)
--- 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 c467995323ef00b231c32d5488cf8c09e9eae548..a1f5ed51462ceb2fa6cfd23c2eca5b6d6eba64e6 100644 (file)
--- 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 70931d02209eda960510641366a11baea6d2934f..d2d341ece79b0c6fee3bb7fc400c06d8080bb2bd 100644 (file)
--- 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)