[ro-oslib-commits] OSLib/!OsLib/Tools/DefMod2/defmod/sources cheader.c,1.3,1.4 hdr.c,1.5,1.6

[Tony v. d. H. <to...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275/!OsLib/Tools/DefMod2/defmod/sources

Modified Files:
	cheader.c hdr.c 
Log Message:
os.h now included in all headers (20040503-2)

Index: hdr.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/hdr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hdr.c	3 May 2004 15:03:33 -0000	1.5
--- hdr.c	3 May 2004 15:45:19 -0000	1.6
***************
*** 666,673 ****
--- 666,684 ----
        goto finish;
  
+    if ((rc = EmitSSS (file, NULL, "[", ":LNOT: :DEF: ", title, "_Hdr")) < 0)
+       goto finish;
+    if ((rc = EmitSS (file, NULL, "GBLS", title, "_Hdr")) < 0)
+       goto finish;
+    if ((rc = fprintf (file, "\n")) < 0)
+       goto finish;
+ 
     /*Make sure we have Hdr.Types.*/
     if ((rc = Emit_Get (file, "Types")) < 0)
        goto finish;
  
+    /*Make sure we have Hdr.OS.*/
+    if ((rc = Emit_Get (file, "OS")) < 0)
+       goto finish;
+ 
     /*Emit the NEEDS declarations.*/
     context = 0;
***************
*** 683,686 ****
--- 694,698 ----
     }
  
+ #if 0	// moved forward to ensure OS.Hdr is not included recursively
     if ((rc = EmitSSS (file, NULL, "[", ":LNOT: :DEF: ", title, "_Hdr")) < 0)
        goto finish;
***************
*** 689,692 ****
--- 701,705 ----
     if ((rc = fprintf (file, "\n")) < 0)
        goto finish;
+ #endif
  
     /*Emit the CONST declarations.*/

Index: cheader.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/cheader.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cheader.c	3 May 2004 15:03:33 -0000	1.3
--- cheader.c	3 May 2004 15:45:18 -0000	1.4
***************
*** 438,441 ****
--- 438,448 ----
        goto finish;
  
+    /*Make sure we have "os.h".*/
+    if ((rc = fprintf (file,
+          "#ifndef os_H\n"
+          "#include \"oslib/os.h\"\n"
+ 	 "#endif\n\n")) < 0)
+       goto finish;
+ 
     /*Emit the NEEDS declarations.*/
     context = 0;