Author: paultcochrane
Date: Wed May  9 05:16:46 2007
New Revision: 18485

Modified:
   trunk/tools/build/c2str.pl
   trunk/tools/build/vtable_h.pl

Log:
[tools] Further guard header macro updates.  Patch courtesy of Mark Glines 
<mark at glines dot org>

Modified: trunk/tools/build/c2str.pl
==============================================================================
--- trunk/tools/build/c2str.pl  (original)
+++ trunk/tools/build/c2str.pl  Wed May  9 05:16:46 2007
@@ -161,6 +161,9 @@
  *
  */
 
+#ifndef PARROT_SRC_STRING_PRIVATE_CSTRING_H_GUARD
+#define PARROT_SRC_STRING_PRIVATE_CSTRING_H_GUARD
+
 static const struct _cstrings {
     UINTVAL len;
     Parrot_UInt4 hash_val;
@@ -182,6 +185,8 @@
     # append the C code coda
     print $OUT <<HEADER;
 
+#endif /* PARROT_SRC_STRING_PRIVATE_CSTRING_H_GUARD */
+
 /*
  * Local variables:
  *   c-file-style: "parrot"

Modified: trunk/tools/build/vtable_h.pl
==============================================================================
--- trunk/tools/build/vtable_h.pl       (original)
+++ trunk/tools/build/vtable_h.pl       Wed May  9 05:16:46 2007
@@ -42,7 +42,7 @@
 ** This file is generated automatically from 'vtable.tbl' by vtable_h.pl
 */
 
-#if !defined(PARROT_VTABLE_H_GUARD)
+#ifndef PARROT_VTABLE_H_GUARD
 #define PARROT_VTABLE_H_GUARD
 
 #include "parrot/parrot.h"
@@ -61,11 +61,11 @@
 
 print $OUT vtbl_macros($vtable);
 
-print $OUT "\n#endif\n";
-
-# append the C code coda
+# append the guard suffix and C code coda
 print $OUT <<"EOC";
 
+#endif /* PARROT_VTABLE_H_GUARD */
+
 /*
  * Local variables:
  *   c-file-style: "parrot"

Reply via email to