Standardize header guards.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42615 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 21 insertions, 15 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index df340665bb2..ff098e71529 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-25  Sam TH  <sam@uchicago.edu>
+
+	* gen-table.pl javaop.h jcf.h lex.h,
+	parse.h: Fix header include guards.
+
 2001-05-23  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* jv-scan.c (version): Update copyright year.
diff --git a/gcc/java/gen-table.pl b/gcc/java/gen-table.pl
index d631ab383f5..44bdc2a4cee 100644
--- a/gcc/java/gen-table.pl
+++ b/gcc/java/gen-table.pl
@@ -183,8 +183,8 @@ sub print_tables
     print OUT "/* This file is automatically generated.  DO NOT EDIT!\n";
     print OUT "   Instead, edit gen-table.pl and re-run.  */\n\n";
 
-    print OUT "#ifndef CHARTABLES_H\n";
-    print OUT "#define CHARTABLES_H\n\n";
+    print OUT "#ifndef GCC_CHARTABLES_H\n";
+    print OUT "#define GCC_CHARTABLES_H\n\n";
 
     print OUT "#define LETTER_START 1\n";
     print OUT "#define LETTER_PART  2\n\n";
@@ -204,7 +204,7 @@ sub print_tables
     }
     print OUT "\n};\n\n";
 
-    print OUT "#endif /* CHARTABLES_H */\n";
+    print OUT "#endif /* ! GCC_CHARTABLES_H */\n";
 
     close (OUT);
 
diff --git a/gcc/java/javaop.h b/gcc/java/javaop.h
index 6ce33ff67a9..cbd939bbf99 100644
--- a/gcc/java/javaop.h
+++ b/gcc/java/javaop.h
@@ -23,8 +23,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 /* Written by Per Bothner <bothner@cygnus.com>, February 1996. */
 
-#ifndef JAVAOP_H
-#define JAVAOP_H
+#ifndef GCC_JAVAOP_H
+#define GCC_JAVAOP_H
 
 typedef	unsigned char	uint8;
 #ifndef int16
@@ -155,4 +155,4 @@ WORDS_TO_DOUBLE(jword hi, jword lo)
    : ((PREFIX_CHAR) & 0x10) == 0 ? 3 \
    : ((PREFIX_CHAR) & 0x08) == 0 ? 4 : 5)
 
-#endif /* !JAVAOP_H */
+#endif /* ! GCC_JAVAOP_H */
diff --git a/gcc/java/jcf.h b/gcc/java/jcf.h
index 4203ec0853d..4586f06093a 100644
--- a/gcc/java/jcf.h
+++ b/gcc/java/jcf.h
@@ -23,8 +23,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 /* Written by Per Bothner <bothner@cygnus.com>, February 1996. */
 
-#ifndef JCF_H
-#define JCF_H
+#ifndef GCC_JCF_H
+#define GCC_JCF_H
 #include "javaop.h"
 #ifndef DEFUN
 #if defined (__STDC__)
@@ -278,4 +278,4 @@ extern int jcf_path_is_zipfile PARAMS ((void *));
 extern int jcf_path_is_system PARAMS ((void *));
 extern int jcf_path_max_len PARAMS ((void));
 
-#endif
+#endif /* ! GCC_JCF_H */
diff --git a/gcc/java/lex.h b/gcc/java/lex.h
index 7934b50f592..e9c47ded8de 100644
--- a/gcc/java/lex.h
+++ b/gcc/java/lex.h
@@ -23,8 +23,8 @@ Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
 The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
-#ifndef JV_LEX_H
-#define JV_LEX_H
+#ifndef GCC_JAVA_LEX_H
+#define GCC_JAVA_LEX_H
 
 #include <setjmp.h>		/* set_float_handler argument uses it */
 
@@ -288,4 +288,4 @@ extern void set_float_handler PARAMS ((jmp_buf));
 #define JAVA_CHAR_ERROR -2
 #define UEOF -1
 
-#endif
+#endif /* ! GCC_JAVA_LEX_H */
diff --git a/gcc/java/parse.h b/gcc/java/parse.h
index c9157000c9a..c11e70d9295 100644
--- a/gcc/java/parse.h
+++ b/gcc/java/parse.h
@@ -23,8 +23,8 @@ Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
 The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
-#ifndef JV_LANG_H
-#define JV_LANG_H
+#ifndef GCC_JAVA_PARSE_H
+#define GCC_JAVA_PARSE_H
 
 #include "lex.h"
 
@@ -932,4 +932,5 @@ extern void java_expand_classes PARAMS ((void));
 
 extern struct parser_ctxt *ctxp;
 struct parser_ctxt *ctxp_for_generation;
-#endif
+
+#endif /* ! GCC_JAVA_PARSE_H */