Author: paultcochrane
Date: Wed May 9 05:17:22 2007
New Revision: 18487
Modified:
trunk/config/gen/config_h.pm
trunk/config/gen/config_h/feature_h.in
trunk/config/gen/core_pmcs.pm
trunk/config/gen/platform.pm
Log:
[config] Further guard header macro updates. Patch courtesy of Mark Glines
<mark at glines dot org>
Modified: trunk/config/gen/config_h.pm
==============================================================================
--- trunk/config/gen/config_h.pm (original)
+++ trunk/config/gen/config_h.pm Wed May 9 05:17:22 2007
@@ -56,6 +56,9 @@
** This file is generated automatically by Configure.pl
*/
+#ifndef PARROT_HAS_HEADER_H_GUARD
+#define PARROT_HAS_HEADER_H_GUARD
+
/*
* i_(\\w+) header includes
*/
@@ -119,9 +122,11 @@
}
}
- # append the C code coda
+ # append the guard endif and C code coda
print {$HH} <<EOF;
+#endif /* PARROT_HAS_HEADER_H_GUARD */
+
/*
* Local variables:
* c-file-style: "parrot"
Modified: trunk/config/gen/config_h/feature_h.in
==============================================================================
--- trunk/config/gen/config_h/feature_h.in (original)
+++ trunk/config/gen/config_h/feature_h.in Wed May 9 05:17:22 2007
@@ -3,7 +3,7 @@
*/
-#if !defined(PARROT_FEATURE_H_GUARD)
+#ifndef PARROT_FEATURE_H_GUARD
#define PARROT_FEATURE_H_GUARD
#perl - all below here gets evaled by perl, OUT is the filehandle
@@ -149,7 +149,7 @@
print OUT <<'END_PRINT';
-#endif
+#endif /* PARROT_FEATURE_H_GUARD */
END_PRINT
print OUT <<"END_PRINT";
Modified: trunk/config/gen/core_pmcs.pm
==============================================================================
--- trunk/config/gen/core_pmcs.pm (original)
+++ trunk/config/gen/core_pmcs.pm Wed May 9 05:17:22 2007
@@ -46,6 +46,9 @@
* Automatically generated by config/gen/core_pmcs.pm
*/
+#ifndef PARROT_CORE_PMCS_H_GUARD
+#define PARROT_CORE_PMCS_H_GUARD
+
/* &gen_from_enum(pmctypes.pasm) subst(s/enum_class_(\\w+)/\$1/e) */
enum {
END_H
@@ -63,6 +66,8 @@
/* &end_gen */
+#endif /* PARROT_CORE_PMCS_H_GUARD */
+
/*
* Local variables:
* c-file-style: "parrot"
Modified: trunk/config/gen/platform.pm
==============================================================================
--- trunk/config/gen/platform.pm (original)
+++ trunk/config/gen/platform.pm Wed May 9 05:17:22 2007
@@ -74,7 +74,12 @@
or die "Can't open include/parrot/platform.h: $!";
print {$PLATFORM_H} <<"END_HERE";
-#if !defined(PARROT_PLATFORM_H_GUARD)
+/* ex: set ro:
+** !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
+**
+** This file is generated automatically by config/gen/platform.pm
+*/
+#ifndef PARROT_PLATFORM_H_GUARD
#define PARROT_PLATFORM_H_GUARD
/*
@@ -145,7 +150,7 @@
# Add the C-coda
print $PLATFORM_H <<"END_HERE";
-#endif
+#endif /* PARROT_PLATFORM_H_GUARD */
$coda
END_HERE