From 88657302b711baa2b317b2bb91c93d0a03e16b36 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@gcc.gnu.org>
Date: Fri, 25 May 2001 18:31:47 -0700
Subject: [PATCH] Standardize header guards.
From-SVN: r42615
---
gcc/ChangeLog | 20 ++++++++++++++++++++
gcc/basic-block.h | 6 +++---
gcc/bitmap.h | 6 +++---
gcc/c-common.h | 2 +-
gcc/c-dump.h | 5 +++++
gcc/c-lex.h | 6 +++---
gcc/c-pragma.h | 6 +++---
gcc/c-tree.h | 6 +++---
gcc/ch/ChangeLog | 4 ++++
gcc/ch/ch-tree.h | 6 +++---
gcc/ch/tasking.h | 6 +++---
gcc/collect2.h | 6 +++---
gcc/config/arm/arm-protos.h | 2 +-
gcc/config/arm/arm.h | 6 +++---
gcc/config/c4x/c4x-protos.h | 2 +-
gcc/config/dbxelf.h | 6 +++---
gcc/config/fp-bit.h | 6 +++---
gcc/config/h8300/h8300-protos.h | 2 +-
gcc/config/h8300/h8300.h | 2 +-
gcc/config/i370/i370-protos.h | 2 +-
gcc/config/i370/i370.h | 6 +++---
gcc/config/i960/i960-protos.h | 2 +-
gcc/config/mcore/mcore.h | 6 +++---
gcc/config/mips/mips-protos.h | 6 +++---
gcc/config/sh/sh-protos.h | 2 +-
gcc/config/sh/sh.h | 2 +-
gcc/config/v850/v850-protos.h | 2 +-
gcc/config/v850/v850.h | 2 +-
gcc/cp/ChangeLog | 6 +++++-
gcc/cp/cp-tree.h | 6 +++---
gcc/cp/lex.h | 6 +++---
gcc/cppdefault.h | 6 +++---
gcc/cpphash.h | 2 +-
gcc/cpplib.h | 5 +++--
gcc/defaults.h | 3 +--
gcc/diagnostic.h | 6 +++---
gcc/errors.h | 6 +++---
gcc/except.h | 4 ++--
gcc/f/ChangeLog | 10 ++++++++++
gcc/f/bad.h | 6 +++---
gcc/f/bit.h | 6 +++---
gcc/f/bld.h | 6 +++---
gcc/f/com.h | 6 +++---
gcc/f/data.h | 6 +++---
gcc/f/equiv.h | 6 +++---
gcc/f/expr.h | 6 +++---
gcc/f/global.h | 7 ++++---
gcc/f/implic.h | 6 +++---
gcc/f/info.h | 6 +++---
gcc/f/intrin.h | 6 +++---
gcc/f/lab.h | 6 +++---
gcc/f/lex.h | 6 +++---
gcc/f/malloc.h | 6 +++---
gcc/f/name.h | 6 +++---
gcc/f/proj.h | 6 +++---
gcc/f/src.h | 6 +++---
gcc/f/st.h | 6 +++---
gcc/f/sta.h | 6 +++---
gcc/f/stb.h | 6 +++---
gcc/f/stc.h | 6 +++---
gcc/f/std.h | 6 +++---
gcc/f/ste.h | 6 +++---
gcc/f/storag.h | 6 +++---
gcc/f/stp.h | 6 +++---
gcc/f/str.h | 6 +++---
gcc/f/sts.h | 6 +++---
gcc/f/stt.h | 6 +++---
gcc/f/stu.h | 6 +++---
gcc/f/stv.h | 6 +++---
gcc/f/stw.h | 6 +++---
gcc/f/symbol.h | 6 +++---
gcc/f/target.h | 6 +++---
gcc/f/top.h | 6 +++---
gcc/f/type.h | 6 +++---
gcc/f/version.h | 6 +++---
gcc/f/where.h | 6 +++---
gcc/fixinc/fixlib.h | 6 +++---
gcc/fixinc/server.h | 7 ++++---
gcc/flags.h | 2 +-
gcc/gcc.h | 6 +++---
gcc/gcov-io.h | 6 +++---
gcc/graph.h | 6 +++---
gcc/gstab.h | 9 +++------
gcc/gthr-aix.h | 6 +++---
gcc/gthr-dce.h | 6 +++---
gcc/gthr-posix.h | 6 +++---
gcc/gthr-rtems.h | 6 +++---
gcc/gthr-single.h | 6 +++---
gcc/gthr-solaris.h | 6 +++---
gcc/gthr-vxworks.h | 6 +++---
gcc/gthr-win32.h | 6 +++---
gcc/gthr.h | 6 +++---
gcc/hard-reg-set.h | 6 +++---
gcc/hwint.h | 6 +++---
gcc/insn-addr.h | 6 +++---
gcc/java/ChangeLog | 5 +++++
gcc/java/gen-table.pl | 6 +++---
gcc/java/javaop.h | 6 +++---
gcc/java/jcf.h | 6 +++---
gcc/java/lex.h | 6 +++---
gcc/java/parse.h | 7 ++++---
gcc/libgcc2.h | 6 +++---
gcc/mbchar.h | 6 +++---
gcc/mkdeps.h | 6 +++---
gcc/params.h | 6 +++---
gcc/prefix.h | 6 +++---
gcc/real.h | 6 +++---
gcc/rtl.h | 6 +++---
gcc/sbitmap.h | 6 +++---
gcc/system.h | 6 +++---
gcc/timevar.h | 2 +-
gcc/toplev.h | 6 +++---
gcc/tradcpp.h | 6 +++---
gcc/tsystem.h | 6 +++---
gcc/varray.h | 8 ++++----
gcc/version.h | 6 +++---
116 files changed, 352 insertions(+), 304 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2cd17a1effeb..381e456d050d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,23 @@
+2001-05-25 Sam TH <sam@uchicago.edu>
+
+ * basic-block.h: Fix header include guards.
+ * bitmap.h c-dump.h c-lex.h c-pragma.h c-tree.h collect2.h
+ cppdefault.h cpphash.h cpplib.h defaults.h diagnostic.h errors.h
+ except.h flags.h gcc.h gcov-io.h graph.h gstab.h gthr-aix.h
+ gthr-dce.h gthr-posix.h gthr-rtems.h gthr-single.h gthr-solaris.h
+ gthr-vxworks.h gthr-win32.h gthr.h hard-reg-set.h hwint.h
+ insn-addr.h libgcc2.h mbchar.h mkdeps.h params.h prefix.h real.h
+ rtl.h sbitmap.h system.h timevar.h toplev.h tradcpp.h tsystem.h
+ varray.h version.h: Likewise.
+ * config/dbxelf.h config/fp-bit.h config/arm/arm-protos.h
+ config/arm/arm.h config/c4x/c4x-protos.h
+ config/h8300/h8300-protos.h config/h8300/h8300.h
+ config/i370/i370-protos.h config/i370/i370.h
+ config/i960/i960-protos.h config/mcore/mcore.h
+ config/mips/mips-protos.h config/sh/sh-protos.h config/sh/sh.h
+ config/v850/v850-protos.h config/v850/v850.h: Likewise.
+ * fixinc/fixlib.h fixinc/server.h: Likewise.
+
2001-05-25 Stacey Sheldon <ssheldon@Catena.com>
* config/arc/initfini.c (.init): Fix typo.
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index f3911c8f518c..8ffcbce368ba 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _BASIC_BLOCK_H
-#define _BASIC_BLOCK_H 1
+#ifndef GCC_BASIC_BLOCK_H
+#define GCC_BASIC_BLOCK_H
#include "bitmap.h"
#include "sbitmap.h"
@@ -578,4 +578,4 @@ enum cdi_direction
extern void calculate_dominance_info PARAMS ((int *, sbitmap *,
enum cdi_direction));
-#endif /* _BASIC_BLOCK_H */
+#endif /* GCC_BASIC_BLOCK_H */
diff --git a/gcc/bitmap.h b/gcc/bitmap.h
index d96e793a3494..0eb599270730 100644
--- a/gcc/bitmap.h
+++ b/gcc/bitmap.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _BITMAP_H
-#define _BITMAP_H 1
+#ifndef GCC_BITMAP_H
+#define GCC_BITMAP_H
/* Number of words to use for each element in the linked list. */
@@ -336,4 +336,4 @@ do { \
} \
} while (0)
-#endif /* _BITMAP_H */
+#endif /* GCC_BITMAP_H */
diff --git a/gcc/c-common.h b/gcc/c-common.h
index c1b273e6e301..8625c9138385 100644
--- a/gcc/c-common.h
+++ b/gcc/c-common.h
@@ -835,4 +835,4 @@ struct c_fileinfo
struct c_fileinfo *get_fileinfo PARAMS ((const char *));
extern void dump_time_statistics PARAMS ((void));
-#endif
+#endif /* ! GCC_C_COMMON_H */
diff --git a/gcc/c-dump.h b/gcc/c-dump.h
index bb246ceea47a..5afdee62bbf6 100644
--- a/gcc/c-dump.h
+++ b/gcc/c-dump.h
@@ -19,6 +19,9 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef GCC_C_DUMP_H
+#define GCC_C_DUMP_H
+
/* Flags used with queue functions. */
#define DUMP_NONE 0
#define DUMP_BINFO 1
@@ -82,3 +85,5 @@ extern void queue_and_dump_index
PARAMS ((dump_info_p, const char *, tree, int));
extern void queue_and_dump_type
PARAMS ((dump_info_p, tree));
+
+#endif /* ! GCC_C_DUMP_H */
diff --git a/gcc/c-lex.h b/gcc/c-lex.h
index 2ca4e864817c..e2929f426252 100644
--- a/gcc/c-lex.h
+++ b/gcc/c-lex.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _C_LEX_H
-#define _C_LEX_H
+#ifndef GCC_C_LEX_H
+#define GCC_C_LEX_H
extern tree make_pointer_declarator PARAMS ((tree, tree));
extern void position_after_white_space PARAMS ((void));
@@ -32,4 +32,4 @@ extern int indent_level;
struct cpp_reader;
extern struct cpp_reader* parse_in;
-#endif
+#endif /* ! GCC_C_LEX_H */
diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h
index e6af073dfad1..d15c3e5d35a8 100644
--- a/gcc/c-pragma.h
+++ b/gcc/c-pragma.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _C_PRAGMA_H
-#define _C_PRAGMA_H
+#ifndef GCC_C_PRAGMA_H
+#define GCC_C_PRAGMA_H
#ifdef HANDLE_SYSV_PRAGMA
/* Support #pragma weak iff ASM_WEAKEN_LABEL and ASM_OUTPUT_DEF are
@@ -70,4 +70,4 @@ extern void cpp_register_pragma PARAMS ((cpp_reader *,
extern void cpp_register_pragma_space PARAMS ((cpp_reader *, const char *));
#endif
-#endif /* _C_PRAGMA_H */
+#endif /* GCC_C_PRAGMA_H */
diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index 8264ebd06901..508567a91d96 100644
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _C_TREE_H
-#define _C_TREE_H
+#ifndef GCC_C_TREE_H
+#define GCC_C_TREE_H
#include "c-common.h"
@@ -361,4 +361,4 @@ extern int mesg_implicit_function_declaration;
/* In c-decl.c */
extern void finish_incomplete_decl PARAMS ((tree));
-#endif /* not _C_TREE_H */
+#endif /* ! GCC_C_TREE_H */
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 912bca318620..30775c61f597 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25 Sam TH <sam@uchicago.edu>
+
+ * ch-tree.h tasking.h: Fix header include guards.
+
2001-05-20 Joseph S. Myers <jsm28@cam.ac.uk>
* Make-lang.in (chill.dvi): Remove bogus dependencies. Don't cd
diff --git a/gcc/ch/ch-tree.h b/gcc/ch/ch-tree.h
index 4d652b1eb2b3..d38445bb0f43 100644
--- a/gcc/ch/ch-tree.h
+++ b/gcc/ch/ch-tree.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _CH_TREE_H
-#define _CH_TREE_H
+#ifndef GCC_CH_TREE_H
+#define GCC_CH_TREE_H
/* Usage of TREE_LANG_FLAG_?:
1: TUPLE_NAMED_FIELD
@@ -1154,4 +1154,4 @@ extern tree deep_fold PARAMS ((tree));
extern const char * const gnuchill_version;
-#endif
+#endif /* ! GCC_CH_TREE_H */
diff --git a/gcc/ch/tasking.h b/gcc/ch/tasking.h
index 7650c2f8cc91..2a899fdfedb4 100644
--- a/gcc/ch/tasking.h
+++ b/gcc/ch/tasking.h
@@ -18,10 +18,10 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _CH_TASKING_H
-#define _CH_TASKING_H
+#ifndef GCC_TASKING_H
+#define GCC_TASKING_H
/* list of this module's process, buffer, etc. decls */
extern tree tasking_list;
-#endif
+#endif /* ! GCC_TASKING_H */
diff --git a/gcc/collect2.h b/gcc/collect2.h
index 87c06f59ea66..d23ca0840a95 100644
--- a/gcc/collect2.h
+++ b/gcc/collect2.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __COLLECT2_H__
-#define __COLLECT2_H__
+#ifndef GCC_COLLECT2_H
+#define GCC_COLLECT2_H
extern void do_tlink PARAMS ((char **, char **));
@@ -48,4 +48,4 @@ extern void fatal PARAMS ((const char *, ...))
extern void fatal_perror PARAMS ((const char *, ...))
ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
-#endif /* ! __COLLECT2_H__ */
+#endif /* ! GCC_COLLECT2_H */
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 8f9376137fe9..9d0664ea069e 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -211,4 +211,4 @@ extern void arm_pr_no_long_calls PARAMS ((cpp_reader *));
extern void arm_pr_long_calls_off PARAMS ((cpp_reader *));
#endif
-#endif /* GCC_ARM_PROTOS_H */
+#endif /* ! GCC_ARM_PROTOS_H */
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 17fe5406e7d2..073672fb4270 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -23,8 +23,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __ARM_H__
-#define __ARM_H__
+#ifndef GCC_ARM_H
+#define GCC_ARM_H
#define TARGET_CPU_arm2 0x0000
#define TARGET_CPU_arm250 0x0000
@@ -3008,4 +3008,4 @@ enum arm_builtins
#define MD_EXPAND_BUILTIN(EXP, TARGET, SUBTARGET, MODE, IGNORE) \
arm_expand_builtin ((EXP), (TARGET), (SUBTARGET), (MODE), (IGNORE))
-#endif /* __ARM_H__ */
+#endif /* ! GCC_ARM_H */
diff --git a/gcc/config/c4x/c4x-protos.h b/gcc/config/c4x/c4x-protos.h
index 6449aa726506..4ea5c8beb35a 100644
--- a/gcc/config/c4x/c4x-protos.h
+++ b/gcc/config/c4x/c4x-protos.h
@@ -313,4 +313,4 @@ extern void c4x_pr_ignored PARAMS ((cpp_reader *));
extern void c4x_init_pragma PARAMS ((int (*) (tree *)));
#endif
-#endif
+#endif /* ! GCC_C4X_PROTOS_H */
diff --git a/gcc/config/dbxelf.h b/gcc/config/dbxelf.h
index 8a2c266a82f1..c1490aeb713b 100644
--- a/gcc/config/dbxelf.h
+++ b/gcc/config/dbxelf.h
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA. */
support -gstabs generating stabs in sections, as produced by gas
and understood by gdb. */
-#ifndef __DBX_ELF_H
-#define __DBX_ELF_H
+#ifndef GCC_DBX_ELF_H
+#define GCC_DBX_ELF_H
/* Output DBX (stabs) debugging information if doing -gstabs. */
@@ -84,4 +84,4 @@ while (0)
asm_fprintf (FILE, \
"\t.text\n\t.stabs \"\",%d,0,0,%LLetext\n%LLetext:\n", N_SO)
-#endif /* __DBX_ELF_H */
+#endif /* ! GCC_DBX_ELF_H */
diff --git a/gcc/config/fp-bit.h b/gcc/config/fp-bit.h
index f4471f9067a0..3bd8ba84dbda 100644
--- a/gcc/config/fp-bit.h
+++ b/gcc/config/fp-bit.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __FP_BIT_H__
-#define __FP_BIT_H__
+#ifndef GCC_FP_BIT_H
+#define GCC_FP_BIT_H
/* Defining FINE_GRAINED_LIBRARIES allows one to select which routines
from this file are compiled via additional -D options.
@@ -414,4 +414,4 @@ extern SFtype df_to_sf (DFtype);
#endif
#endif /* ! FLOAT */
-#endif /* __FP_BIT_H__ */
+#endif /* ! GCC_FP_BIT_H */
diff --git a/gcc/config/h8300/h8300-protos.h b/gcc/config/h8300/h8300-protos.h
index 1535b29c6f2e..e33d4635fd20 100644
--- a/gcc/config/h8300/h8300-protos.h
+++ b/gcc/config/h8300/h8300-protos.h
@@ -83,4 +83,4 @@ extern void h8300_pr_interrupt PARAMS ((cpp_reader *));
extern void h8300_pr_saveall PARAMS ((cpp_reader *));
#endif
-#endif /* GCC_H8300_PROTOS_H */
+#endif /* ! GCC_H8300_PROTOS_H */
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index 68747ac92ba0..d633757ce581 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -1485,4 +1485,4 @@ readonly_data () \
#define MOVE_RATIO 3
-#endif /* GCC_H8300_H */
+#endif /* ! GCC_H8300_H */
diff --git a/gcc/config/i370/i370-protos.h b/gcc/config/i370/i370-protos.h
index 7ee1d3ff6e1b..872ad7f6374d 100644
--- a/gcc/config/i370/i370-protos.h
+++ b/gcc/config/i370/i370-protos.h
@@ -54,4 +54,4 @@ extern void mvs_free_label_list PARAMS ((void));
extern void i370_pr_map PARAMS ((cpp_reader *));
#endif
-#endif
+#endif /* ! GCC_I370_PROTOS_H */
diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h
index 6bb638b95a5b..4f65617ec36f 100644
--- a/gcc/config/i370/i370.h
+++ b/gcc/config/i370/i370.h
@@ -22,8 +22,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __I370_H__
-#define __I370_H__
+#ifndef GCC_I370_H
+#define GCC_I370_H
/* Run-time compilation parameters selecting different hardware subsets. */
extern int target_flags;
@@ -2165,4 +2165,4 @@ abort(); \
fprintf ((FILE), ",%u\n", (ROUNDED)))
#endif /* TARGET_ELF_ABI */
-#endif /* __I370_H__ */
+#endif /* ! GCC_I370_H */
diff --git a/gcc/config/i960/i960-protos.h b/gcc/config/i960/i960-protos.h
index 130dddeefe40..629f2c175c9e 100644
--- a/gcc/config/i960/i960-protos.h
+++ b/gcc/config/i960/i960-protos.h
@@ -111,4 +111,4 @@ extern void i960_pr_align PARAMS ((cpp_reader *));
extern void i960_pr_noalign PARAMS ((cpp_reader *));
#endif
-#endif /* i960-protos.h */
+#endif /* ! GCC_I960_PROTOS_H */
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index a6eb358a7371..94816e959386 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-#ifndef __MCORE__H
-#define __MCORE__H
+#ifndef GCC_MCORE_H
+#define GCC_MCORE_H
/* RBE: need to move these elsewhere. */
#undef LIKE_PPC_ABI
@@ -1451,4 +1451,4 @@ extern long mcore_current_compilation_timestamp;
{ "mcore_store_multiple_operation", { PARALLEL }}, \
{ "mcore_call_address_operand", { REG, SUBREG, CONST_INT }}, \
-#endif /* __MCORE__H */
+#endif /* ! GCC_MCORE_H */
diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h
index 826cd5e1b6a0..2cc8166b6bfd 100644
--- a/gcc/config/mips/mips-protos.h
+++ b/gcc/config/mips/mips-protos.h
@@ -23,8 +23,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __MIPS_PROTOS_H__
-#define __MIPS_PROTOS_H__
+#ifndef GCC_MIPS_PROTOS_H
+#define GCC_MIPS_PROTOS_H
extern HOST_WIDE_INT compute_frame_size PARAMS ((HOST_WIDE_INT));
extern void function_epilogue PARAMS ((FILE *, HOST_WIDE_INT));
@@ -157,4 +157,4 @@ extern int m16_usym8_4 PARAMS ((rtx, enum machine_mode));
extern int m16_usym5_4 PARAMS ((rtx, enum machine_mode));
#endif /* RTX_CODE */
-#endif /* __MIPS_PROTOS_H__ */
+#endif /* ! GCC_MIPS_PROTOS_H */
diff --git a/gcc/config/sh/sh-protos.h b/gcc/config/sh/sh-protos.h
index 79b66773f842..2ccaa724fdee 100644
--- a/gcc/config/sh/sh-protos.h
+++ b/gcc/config/sh/sh-protos.h
@@ -131,4 +131,4 @@ extern void sh_pr_trapa PARAMS ((cpp_reader *));
extern void sh_pr_nosave_low_regs PARAMS ((cpp_reader *));
#endif
-#endif /* sh-protos.h */
+#endif /* ! GCC_SH_PROTOS_H */
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index b6a21f46ba8f..5bda01daba80 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -2464,4 +2464,4 @@ do { \
1: .long " USER_LABEL_PREFIX #func " - 0b\n\
2:")
-#endif /* sh.h */
+#endif /* ! GCC_SH_H */
diff --git a/gcc/config/v850/v850-protos.h b/gcc/config/v850/v850-protos.h
index 8bc387119617..1ff65e5f72a9 100644
--- a/gcc/config/v850/v850-protos.h
+++ b/gcc/config/v850/v850-protos.h
@@ -98,4 +98,4 @@ extern void ghs_pragma_endzda PARAMS ((cpp_reader *));
#undef Mmode
-#endif /* v850-protos.h */
+#endif /* ! GCC_V850_PROTOS_H */
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 5380d1e1f798..09632e7e5dae 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -1633,4 +1633,4 @@ extern union tree_node * GHS_current_section_names [(int) COUNT_OF_GHS_SECTION_K
{ "register_is_ok_for_epilogue",{ REG }}, \
{ "not_power_of_two_operand", { CONST_INT }},
-#endif /* v850.h */
+#endif /* ! GCC_V850_H */
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bf9bd893529b..e8ab9483fe23 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,4 +1,8 @@
-2001-05-26 Mark Mitchell <mark@codesourcery.com>
+2001-05-25 Sam TH <sam@uchicago.edu>
+
+ * cp-tree.h lex.h: Fix header include guards.
+
+2001-05-25 Mark Mitchell <mark@codesourcery.com>
* decl.c (init_decl_processing): Tweak.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e5065e4cec6b..e820303243ce 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -25,8 +25,8 @@ Boston, MA 02111-1307, USA. */
#include "splay-tree.h"
#include "varray.h"
-#ifndef _CP_TREE_H
-#define _CP_TREE_H
+#ifndef GCC_CP_TREE_H
+#define GCC_CP_TREE_H
#include "c-common.h"
@@ -4533,4 +4533,4 @@ extern int cp_dump_tree PARAMS ((dump_info_p, tree));
/* -- end of C++ */
-#endif /* not _CP_TREE_H */
+#endif /* ! GCC_CP_TREE_H */
diff --git a/gcc/cp/lex.h b/gcc/cp/lex.h
index f5f7d454cf7e..9f86833777b8 100644
--- a/gcc/cp/lex.h
+++ b/gcc/cp/lex.h
@@ -21,8 +21,8 @@ can know your rights and responsibilities. It should be in a
file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-#ifndef _CP_LEX_H
-#define _CP_LEX_H
+#ifndef GCC_CP_LEX_H
+#define GCC_CP_LEX_H
#if 0
/* Formerly, the RID_* values used as mask bits did not fit into a
@@ -84,4 +84,4 @@ extern int pending_lang_change;
extern int yylex PARAMS ((void));
-#endif /* _CP_LEX_H */
+#endif /* ! GCC_CP_LEX_H */
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
index db7063cd662d..8ee6a1fda5ea 100644
--- a/gcc/cppdefault.h
+++ b/gcc/cppdefault.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifndef __GCC_CPPDEFAULT__
-#define __GCC_CPPDEFAULT__
+#ifndef GCC_CPPDEFAULT_H
+#define GCC_CPPDEFAULT_H
/* This header contains declarations and/or #defines for all the
hard-wired defaults in cpp. Note it's used by both cpplib and
@@ -109,4 +109,4 @@ extern const struct default_include cpp_include_defaults[];
extern const char cpp_GCC_INCLUDE_DIR[];
extern const size_t cpp_GCC_INCLUDE_DIR_len;
-#endif /* cppdefault.h */
+#endif /* ! GCC_CPPDEFAULT_H */
diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index 17438c7a4e42..56d90681dcbb 100644
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -514,4 +514,4 @@ ufputs (s, f)
return fputs ((const char *)s, f);
}
-#endif /* GCC_CPPHASH_H */
+#endif /* ! GCC_CPPHASH_H */
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index bfc6a3fb6cd1..c05b5e2e431b 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -31,7 +31,7 @@ extern "C" {
#endif
/* For complex reasons, cpp_reader is also typedefed in c-pragma.h. */
-#ifndef _C_PRAGMA_H
+#ifndef GCC_C_PRAGMA_H
typedef struct cpp_reader cpp_reader;
#endif
typedef struct cpp_buffer cpp_buffer;
@@ -631,4 +631,5 @@ extern void cpp_make_system_header PARAMS ((cpp_reader *, int, int));
#ifdef __cplusplus
}
#endif
-#endif /* GCC_CPPLIB_H */
+
+#endif /* ! GCC_CPPLIB_H */
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 3b8d0a17c495..2989b6674eef 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -351,5 +351,4 @@ do { \
#define MD_INIT_BUILTINS
#endif
-#endif /* GCC_DEFAULTS_H */
-
+#endif /* ! GCC_DEFAULTS_H */
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 68092adee3f3..9d017584aaff 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_DIAGNOSTIC_H__
-#define __GCC_DIAGNOSTIC_H__
+#ifndef GCC_DIAGNOSTIC_H
+#define GCC_DIAGNOSTIC_H
#include "obstack.h"
@@ -227,4 +227,4 @@ extern int error_function_changed PARAMS ((void));
extern void record_last_error_function PARAMS ((void));
extern void report_problematic_module PARAMS ((output_buffer *));
-#endif /* __GCC_DIAGNOSTIC_H__ */
+#endif /* ! GCC_DIAGNOSTIC_H */
diff --git a/gcc/errors.h b/gcc/errors.h
index d9988f652564..afb519a09300 100644
--- a/gcc/errors.h
+++ b/gcc/errors.h
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA. */
in the generator programs; eventually we would like to use them in
cc1 too, but that's a longer term project. */
-#ifndef __GCC_ERRORS_H__
-#define __GCC_ERRORS_H__
+#ifndef GCC_ERRORS_H
+#define GCC_ERRORS_H
extern void warning PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
extern void error PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
@@ -38,4 +38,4 @@ extern void fancy_abort PARAMS ((const char *, int, const char *))
extern int have_error;
extern const char *progname;
-#endif
+#endif /* ! GCC_ERRORS_H */
diff --git a/gcc/except.h b/gcc/except.h
index 2720241d9a65..1671cf67b5c5 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -31,7 +31,7 @@ struct rtx_def;
#define rtx struct rtx_def *
#endif
-#ifndef _VARRAY_H_
+#ifndef GCC_VARRAY_H
struct varray_head_tag;
#define varray_type struct varray_head_tag *
#endif
@@ -169,7 +169,7 @@ extern tree (*lang_eh_runtime_type) PARAMS ((tree));
#undef rtx
#endif
-#ifndef _VARRAY_H_
+#ifndef GCC_VARRAY_H
#undef varray_type
#endif
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 210229cd885d..95942e7070a7 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-25 Sam TH <sam@uchicago.edu>
+
+ * bad.h: Fix header include guards.
+ * bit.h bld.h com.h data.h equiv.h expr.h global.h
+ implic.h info.h intrin.h lab.h lex.h malloc.h name.h
+ proj.h src.h st.h sta.h stb.h stc.h std.h ste.h
+ storag.h stp.h str.h sts.h stt.h stu.h stv.h stw.h
+ symbol.h target.h top.h type.h version.h
+ where.h: Likewise.
+
2001-05-22 Toon Moene <toon@moene.indiv.nluug.nl>
* g77.texi: Update last-changed date.
diff --git a/gcc/f/bad.h b/gcc/f/bad.h
index 734022370cd1..8589943cc460 100644
--- a/gcc/f/bad.h
+++ b/gcc/f/bad.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_bad
-#define _H_f_bad
+#ifndef GCC_F_BAD_H
+#define GCC_F_BAD_H
/* Simple definitions and enumerations. */
@@ -105,4 +105,4 @@ void ffebad_string (const char *string);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_BAD_H */
diff --git a/gcc/f/bit.h b/gcc/f/bit.h
index a2acc25a9e90..6b559efe668e 100644
--- a/gcc/f/bit.h
+++ b/gcc/f/bit.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_bit
-#define _H_f_bit
+#ifndef GCC_F_BIT_H
+#define GCC_F_BIT_H
/* Simple definitions and enumerations. */
@@ -81,4 +81,4 @@ void ffebit_test (ffebit b, ffebitCount offset, bool *value, ffebitCount *length
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_BIT_H */
diff --git a/gcc/f/bld.h b/gcc/f/bld.h
index ddbd44841e7b..3347b1cd92fb 100644
--- a/gcc/f/bld.h
+++ b/gcc/f/bld.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_bld
-#define _H_f_bld
+#ifndef GCC_F_BLD_H
+#define GCC_F_BLD_H
/* Simple definitions and enumerations. */
@@ -1036,4 +1036,4 @@ ffetargetCharacterSize ffebld_size_max (ffebld b);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_BLD_H */
diff --git a/gcc/f/com.h b/gcc/f/com.h
index 07abfb06d067..a0d08b1736a2 100644
--- a/gcc/f/com.h
+++ b/gcc/f/com.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_com
-#define _H_f_com
+#ifndef GCC_F_COM_H
+#define GCC_F_COM_H
/* Simple definitions and enumerations. */
@@ -347,4 +347,4 @@ tree ffecom_which_entrypoint_decl (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_COM_H */
diff --git a/gcc/f/data.h b/gcc/f/data.h
index 666612e3964e..a99369d0b040 100644
--- a/gcc/f/data.h
+++ b/gcc/f/data.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_data
-#define _H_f_data
+#ifndef GCC_F_DATA_H
+#define GCC_F_DATA_H
/* Simple definitions and enumerations. */
@@ -71,4 +71,4 @@ bool ffedata_value (ffetargetIntegerDefault rpt, ffebld value,
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_DATA_H */
diff --git a/gcc/f/equiv.h b/gcc/f/equiv.h
index 0a0ce92f4236..f3d2c858d43d 100644
--- a/gcc/f/equiv.h
+++ b/gcc/f/equiv.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_equiv
-#define _H_f_equiv
+#ifndef GCC_F_EQUIV_H
+#define GCC_F_EQUIV_H
/* Simple definitions and enumerations. */
@@ -100,4 +100,4 @@ void ffeequiv_update_save (ffeequiv eq);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_EQUIV_H */
diff --git a/gcc/f/expr.h b/gcc/f/expr.h
index 3f781f91904a..b82173bbf0e7 100644
--- a/gcc/f/expr.h
+++ b/gcc/f/expr.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_expr
-#define _H_f_expr
+#ifndef GCC_F_EXPR_H
+#define GCC_F_EXPR_H
/* Simple definitions and enumerations. */
@@ -191,4 +191,4 @@ void ffeexpr_type_combine (ffeinfoBasictype *nbt, ffeinfoKindtype *nkt,
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_EXPR_H */
diff --git a/gcc/f/global.h b/gcc/f/global.h
index eaf99214b8c4..5ab67417bb17 100644
--- a/gcc/f/global.h
+++ b/gcc/f/global.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_global
-#define _H_f_global
+#ifndef GCC_F_GLOBAL_H
+#define GCC_F_GLOBAL_H
/* Simple definitions and enumerations. */
@@ -197,4 +197,5 @@ void ffeglobal_terminate_1 (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_GLOBAL_H */
+
diff --git a/gcc/f/implic.h b/gcc/f/implic.h
index ae9665384918..44fbfac4e4fa 100644
--- a/gcc/f/implic.h
+++ b/gcc/f/implic.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_implic
-#define _H_f_implic
+#ifndef GCC_F_IMPLIC_H
+#define GCC_F_IMPLIC_H
/* Simple definitions and enumerations. */
@@ -71,4 +71,4 @@ void ffeimplic_terminate_2 (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_IMPLIC_H */
diff --git a/gcc/f/info.h b/gcc/f/info.h
index bbf4e94930dd..69defd27ab63 100644
--- a/gcc/f/info.h
+++ b/gcc/f/info.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_info
-#define _H_f_info
+#ifndef GCC_F_INFO_H
+#define GCC_F_INFO_H
/* Simple definitions and enumerations. */
@@ -183,4 +183,4 @@ ffetype ffeinfo_type (ffeinfoBasictype basictype, ffeinfoKindtype kindtype);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_INFO_H */
diff --git a/gcc/f/intrin.h b/gcc/f/intrin.h
index d6cca3b9f793..76b59dca3fb8 100644
--- a/gcc/f/intrin.h
+++ b/gcc/f/intrin.h
@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
-#ifndef _H_f_intrin
-#define _H_f_intrin
+#ifndef GCC_F_INTRIN_H
+#define GCC_F_INTRIN_H
#ifndef FFEINTRIN_DOC
#define FFEINTRIN_DOC 0 /* 1 means intrinsic documentation only (intdoc.c). */
@@ -134,4 +134,4 @@ ffeIntrinsicState ffeintrin_state_family (ffeintrinFamily family);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_INTRIN_H */
diff --git a/gcc/f/lab.h b/gcc/f/lab.h
index 09f1291ed5e4..fba3808ec8e2 100644
--- a/gcc/f/lab.h
+++ b/gcc/f/lab.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_lab
-#define _H_f_lab
+#ifndef GCC_F_LAB_H
+#define GCC_F_LAB_H
/* Simple definitions and enumerations. */
@@ -151,4 +151,4 @@ ffelab ffelab_new (ffelabValue v);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_LAB_H */
diff --git a/gcc/f/lex.h b/gcc/f/lex.h
index c82a9c86b948..a28d0ac1691d 100644
--- a/gcc/f/lex.h
+++ b/gcc/f/lex.h
@@ -29,8 +29,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_lex
-#define _H_f_lex
+#ifndef GCC_F_LEX_H
+#define GCC_F_LEX_H
/* Simple definitions and enumerations. */
@@ -198,4 +198,4 @@ ffelexToken ffelex_token_use (ffelexToken t);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_LEX_H */
diff --git a/gcc/f/malloc.h b/gcc/f/malloc.h
index d9efdf281dab..1c827209f2c9 100644
--- a/gcc/f/malloc.h
+++ b/gcc/f/malloc.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_malloc
-#define _H_f_malloc
+#ifndef GCC_F_MALLOC_H
+#define GCC_F_MALLOC_H
#ifndef MALLOC_DEBUG
#define MALLOC_DEBUG 0 /* 1 means check caller's use of this module. */
@@ -180,4 +180,4 @@ void malloc_verify_inpool_ (mallocPool pool, mallocType_ type, void *ptr,
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_MALLOC_H */
diff --git a/gcc/f/name.h b/gcc/f/name.h
index 6c3499f07e06..4b18805d3d0a 100644
--- a/gcc/f/name.h
+++ b/gcc/f/name.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_name
-#define _H_f_name
+#ifndef GCC_F_NAME_H
+#define GCC_F_NAME_H
/* Simple definitions and enumerations. */
@@ -106,4 +106,4 @@ ffenameSpace ffename_space_new (mallocPool pool);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_NAME_H */
diff --git a/gcc/f/proj.h b/gcc/f/proj.h
index 4e6a06e5592e..fd4a65cc59f8 100644
--- a/gcc/f/proj.h
+++ b/gcc/f/proj.h
@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
-#ifndef _H_f_proj
-#define _H_f_proj
+#ifndef GCC_F_PROJ_H
+#define GCC_F_PROJ_H
#ifdef USE_HCONFIG
#include "hconfig.h"
@@ -47,4 +47,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define dmpout stderr
#endif
-#endif
+#endif /* ! GCC_F_PROJ_H */
diff --git a/gcc/f/src.h b/gcc/f/src.h
index 666bd853056d..ce5843eaa0e2 100644
--- a/gcc/f/src.h
+++ b/gcc/f/src.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_src
-#define _H_f_src
+#ifndef GCC_F_SRC_H
+#define GCC_F_SRC_H
#include "bad.h"
#include "top.h"
@@ -137,4 +137,4 @@ int ffesrc_strncmp_2c (ffeCase mcase, const char *var, const char *str_uc,
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_SRC_H */
diff --git a/gcc/f/st.h b/gcc/f/st.h
index cfcc7bee6a92..65b99f9bbfee 100644
--- a/gcc/f/st.h
+++ b/gcc/f/st.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_st
-#define _H_f_st
+#ifndef GCC_F_ST_H
+#define GCC_F_ST_H
/* Simple definitions and enumerations. */
@@ -78,4 +78,4 @@ void ffest_terminate_4 (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_ST_H */
diff --git a/gcc/f/sta.h b/gcc/f/sta.h
index 64e16079815a..cf4177715578 100644
--- a/gcc/f/sta.h
+++ b/gcc/f/sta.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_sta
-#define _H_f_sta
+#ifndef GCC_F_STA_H
+#define GCC_F_STA_H
/* Simple definitions and enumerations. */
@@ -114,4 +114,4 @@ void ffesta_set_outpooldisp (ffestaPooldisp d);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STA_H */
diff --git a/gcc/f/stb.h b/gcc/f/stb.h
index 6ee761d588cf..a9b3acc586c7 100644
--- a/gcc/f/stb.h
+++ b/gcc/f/stb.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stb
-#define _H_f_stb
+#ifndef GCC_F_STB_H
+#define GCC_F_STB_H
/* Simple definitions and enumerations. */
@@ -250,4 +250,4 @@ ffelexHandler ffestb_V027 (ffelexToken t);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STB_H */
diff --git a/gcc/f/stc.h b/gcc/f/stc.h
index 12b4783f442d..8b2f7c3aafe5 100644
--- a/gcc/f/stc.h
+++ b/gcc/f/stc.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stc
-#define _H_f_stc
+#ifndef GCC_F_STC_H
+#define GCC_F_STC_H
/* Simple definitions and enumerations. */
@@ -357,4 +357,4 @@ void ffestc_any (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STC_H */
diff --git a/gcc/f/std.h b/gcc/f/std.h
index bfad671bb25a..ea8292cc8dcc 100644
--- a/gcc/f/std.h
+++ b/gcc/f/std.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_std
-#define _H_f_std
+#ifndef GCC_F_STD_H
+#define GCC_F_STD_H
/* Simple definitions and enumerations. */
@@ -295,4 +295,4 @@ void ffestd_any (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STD_H */
diff --git a/gcc/f/ste.h b/gcc/f/ste.h
index 78e98818b090..a4473578e416 100644
--- a/gcc/f/ste.h
+++ b/gcc/f/ste.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_ste
-#define _H_f_ste
+#ifndef GCC_F_STE_H
+#define GCC_F_STE_H
/* Simple definitions and enumerations. */
@@ -169,4 +169,4 @@ void ffeste_terminate_2 (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STE_H */
diff --git a/gcc/f/storag.h b/gcc/f/storag.h
index bc5c9e6ad142..e4aa4046db70 100644
--- a/gcc/f/storag.h
+++ b/gcc/f/storag.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_storag
-#define _H_f_storag
+#ifndef GCC_F_STORAG_H
+#define GCC_F_STORAG_H
/* Simple definitions and enumerations. */
@@ -164,4 +164,4 @@ void ffestorag_update_save (ffestorag s);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STORAG_H */
diff --git a/gcc/f/stp.h b/gcc/f/stp.h
index d995cf0079e3..eca8d0d563da 100644
--- a/gcc/f/stp.h
+++ b/gcc/f/stp.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stp
-#define _H_f_stp
+#ifndef GCC_F_STP_H
+#define GCC_F_STP_H
/* Simple definitions and enumerations. */
@@ -505,4 +505,4 @@ extern union _ffestp_fileu_ ffestp_file;
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STP_H */
diff --git a/gcc/f/str.h b/gcc/f/str.h
index 1ed1228e35d9..543eeeb7c90e 100644
--- a/gcc/f/str.h
+++ b/gcc/f/str.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_str
-#define _H_f_str
+#ifndef GCC_F_STR_H
+#define GCC_F_STR_H
/* Simple definitions and enumerations. */
@@ -82,4 +82,4 @@ ffestrSecond ffestr_second (ffelexToken t);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STR_H */
diff --git a/gcc/f/sts.h b/gcc/f/sts.h
index e1448cdc5fb9..3ca494d81de5 100644
--- a/gcc/f/sts.h
+++ b/gcc/f/sts.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_sts
-#define _H_f_sts
+#ifndef GCC_F_STS_H
+#define GCC_F_STS_H
/* Simple definitions and enumerations. */
@@ -82,4 +82,4 @@ void ffests_puttext (ffests s, const char *text, ffestsLength length);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STS_H */
diff --git a/gcc/f/stt.h b/gcc/f/stt.h
index 341daa7a41d4..e56e843fe30e 100644
--- a/gcc/f/stt.h
+++ b/gcc/f/stt.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stt
-#define _H_f_stt
+#ifndef GCC_F_STT_H
+#define GCC_F_STT_H
/* Simple definitions and enumerations. */
@@ -227,4 +227,4 @@ void ffestt_tokenlist_kill (ffesttTokenList list);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STT_H */
diff --git a/gcc/f/stu.h b/gcc/f/stu.h
index b9d9d521f34a..e01b741b389d 100644
--- a/gcc/f/stu.h
+++ b/gcc/f/stu.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stu
-#define _H_f_stu
+#ifndef GCC_F_STU_H
+#define GCC_F_STU_H
/* Simple definitions and enumerations. */
@@ -66,4 +66,4 @@ ffesymbol ffestu_sym_exec_transition (ffesymbol s);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STU_H */
diff --git a/gcc/f/stv.h b/gcc/f/stv.h
index 22b177e027a1..a3f959f46086 100644
--- a/gcc/f/stv.h
+++ b/gcc/f/stv.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stv
-#define _H_f_stv
+#ifndef GCC_F_STV_H
+#define GCC_F_STV_H
/* Simple definitions and enumerations. */
@@ -162,4 +162,4 @@ extern ffelabNumber ffestv_num_label_defines_;
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STV_H */
diff --git a/gcc/f/stw.h b/gcc/f/stw.h
index 554d047e611c..826e941e4471 100644
--- a/gcc/f/stw.h
+++ b/gcc/f/stw.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_stw
-#define _H_f_stw
+#ifndef GCC_F_STW_H
+#define GCC_F_STW_H
/* Simple definitions and enumerations. */
@@ -184,4 +184,4 @@ ffestw ffestw_use (ffestw block);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_STW_H */
diff --git a/gcc/f/symbol.h b/gcc/f/symbol.h
index 0c7262cd0a6d..cc8b1c0eb2dd 100644
--- a/gcc/f/symbol.h
+++ b/gcc/f/symbol.h
@@ -19,8 +19,8 @@ along with GNU Fortran; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-#ifndef _H_f_symbol
-#define _H_f_symbol
+#ifndef GCC_F_SYMBOL_H
+#define GCC_F_SYMBOL_H
/* The main symbol type. */
@@ -293,4 +293,4 @@ void ffesymbol_update_save (ffesymbol s);
#define ffesymbol_where_line(s) (((s)->name == NULL) ? ffewhere_line_unknown() \
: ffename_where_line((s)->name))
-#endif
+#endif /* ! GCC_F_SYMBOL_H */
diff --git a/gcc/f/target.h b/gcc/f/target.h
index 7eab1067ca74..5ce663d5a347 100644
--- a/gcc/f/target.h
+++ b/gcc/f/target.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_target
-#define _H_f_target
+#ifndef GCC_F_TARGET_H
+#define GCC_F_TARGET_H
#ifdef FFE_STANDALONE
#define HOST_WIDE_INT long
@@ -1892,4 +1892,4 @@ void *ffetarget_memcpy_ (void *dst, void *src, size_t len);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_TARGET_H */
diff --git a/gcc/f/top.h b/gcc/f/top.h
index e15449751b92..eb820fe9dbf0 100644
--- a/gcc/f/top.h
+++ b/gcc/f/top.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_parse
-#define _H_f_parse
+#ifndef GCC_F_TOP_H
+#define GCC_F_TOP_H
/* Simple definitions and enumerations. */
@@ -261,4 +261,4 @@ void ffe_terminate_4 (void);
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_TOP_H */
diff --git a/gcc/f/type.h b/gcc/f/type.h
index aaae51e6565b..9e3bd801e19a 100644
--- a/gcc/f/type.h
+++ b/gcc/f/type.h
@@ -19,8 +19,8 @@ along with GNU Fortran; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-#ifndef _H_f_type
-#define _H_f_type
+#ifndef GCC_F_TYPE_H
+#define GCC_F_TYPE_H
typedef struct _ffetype_ *ffetype;
typedef struct _ffetype_indexes_ *ffetype_indexes_;
@@ -61,4 +61,4 @@ void ffetype_set_star (ffetype base_type, int star, ffetype type);
#define ffetype_terminate_3()
#define ffetype_terminate_4()
-#endif
+#endif /* ! GCC_F_TYPE_H */
diff --git a/gcc/f/version.h b/gcc/f/version.h
index 62f941d25d32..c612071ddbec 100644
--- a/gcc/f/version.h
+++ b/gcc/f/version.h
@@ -1,6 +1,6 @@
-#ifndef _H_f_version
-#define _H_f_version
+#ifndef GCC_F_VERSION_H
+#define GCC_F_VERSION_H
extern const char *ffe_version_string;
-#endif
+#endif /* ! GCC_F_VERSION_H */
diff --git a/gcc/f/where.h b/gcc/f/where.h
index a6a3e1c15f73..a3adb4bda6b7 100644
--- a/gcc/f/where.h
+++ b/gcc/f/where.h
@@ -27,8 +27,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/* Allow multiple inclusion to work. */
-#ifndef _H_f_where
-#define _H_f_where
+#ifndef GCC_F_WHERE_H
+#define GCC_F_WHERE_H
/* Simple definitions and enumerations. */
@@ -135,4 +135,4 @@ void ffewhere_track_kill (ffewhereLine wrl, ffewhereColumn wrc, ffewhereTrack wt
/* End of #include file. */
-#endif
+#endif /* ! GCC_F_EHERE_H */
diff --git a/gcc/fixinc/fixlib.h b/gcc/fixinc/fixlib.h
index e42c43d2ba6b..6bcc6e2c6668 100644
--- a/gcc/fixinc/fixlib.h
+++ b/gcc/fixinc/fixlib.h
@@ -22,8 +22,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef FIXINCLUDES_FIXLIB_H
-#define FIXINCLUDES_FIXLIB_H
+#ifndef GCC_FIXLIB_H
+#define GCC_FIXLIB_H
#include "auto-host.h"
#include "ansidecl.h"
@@ -224,4 +224,4 @@ void mn_get_regexps
PARAMS(( regex_t** label_re, regex_t** name_re,
tCC *who ));
#endif
-#endif /* FIXINCLUDES_FIXLIB_H */
+#endif /* ! GCC_FIXLIB_H */
diff --git a/gcc/fixinc/server.h b/gcc/fixinc/server.h
index c3ed6c7245fb..c27a51eb493f 100644
--- a/gcc/fixinc/server.h
+++ b/gcc/fixinc/server.h
@@ -46,8 +46,8 @@
* If you do not wish that, delete this exception notice.
*/
-#ifndef FIXINC_SERVER_H
-#define FIXINC_SERVER_H
+#ifndef GCC_SERVER_H
+#define GCC_SERVER_H
#include <stdio.h>
#ifdef HAVE_UNISTD_H
@@ -78,4 +78,5 @@ pid_t proc2_open PARAMS (( t_fd_pair * p_pair, tCC ** pp_args));
int chain_open PARAMS (( int in_fd, tCC ** pp_args,
pid_t * p_child));
void close_server PARAMS (( void ));
-#endif /* FIXINC_SERVER_H */
+
+#endif /* ! GCC_SERVER_H */
diff --git a/gcc/flags.h b/gcc/flags.h
index 92492ac439e5..46168a0269fb 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -631,4 +631,4 @@ extern int flag_detailed_statistics;
/* Nonzero means enable synchronous exceptions for non-call instructions. */
extern int flag_non_call_exceptions;
-#endif /* GCC_FLAGS_H */
+#endif /* ! GCC_FLAGS_H */
diff --git a/gcc/gcc.h b/gcc/gcc.h
index d92db458ceaf..62526769d869 100644
--- a/gcc/gcc.h
+++ b/gcc/gcc.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_H__
-#define __GCC_H__
+#ifndef GCC_GCC_H
+#define GCC_GCC_H
#include "version.h"
@@ -51,4 +51,4 @@ extern int lang_specific_extra_outfiles;
extern const char **outfiles;
-#endif /* ! __GCC_H__ */
+#endif /* ! GCC_GCC_H */
diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h
index 0cb93f5e5113..48f83aa00d1f 100644
--- a/gcc/gcov-io.h
+++ b/gcc/gcov-io.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef GCOV_IO_H
-#define GCOV_IO_H
+#ifndef GCC_GCOV_IO_H
+#define GCC_GCOV_IO_H
#include <stdio.h>
#include <sys/types.h>
@@ -139,4 +139,4 @@ __read_long (dest, file, bytes)
return __fetch_long (dest, c, bytes);
}
-#endif
+#endif /* ! GCC_GCOV_IO_H */
diff --git a/gcc/graph.h b/gcc/graph.h
index 9f65b40aacb8..2bbbb154d150 100644
--- a/gcc/graph.h
+++ b/gcc/graph.h
@@ -18,11 +18,11 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GRAPH_H__
-#define __GRAPH_H__
+#ifndef GCC_GRAPH_H
+#define GCC_GRAPH_H
extern void print_rtl_graph_with_bb PARAMS ((const char *, const char *, rtx));
extern void clean_graph_dump_file PARAMS ((const char *, const char *));
extern void finish_graph_dump_file PARAMS ((const char *, const char *));
-#endif /* ! __GRAPH_H__ */
+#endif /* ! GCC_GRAPH_H */
diff --git a/gcc/gstab.h b/gcc/gstab.h
index 80bd594a36aa..ed510c164617 100644
--- a/gcc/gstab.h
+++ b/gcc/gstab.h
@@ -1,8 +1,5 @@
-#ifndef __GNU_STAB__
-
-/* Indicate the GNU stab.h is in use. */
-
-#define __GNU_STAB__
+#ifndef GCC_GSTAB_H
+#define GCC_GSTAB_H
#define __define_stab(NAME, CODE, STRING) NAME=CODE,
@@ -14,4 +11,4 @@ LAST_UNUSED_STAB_CODE
#undef __define_stab
-#endif /* __GNU_STAB_ */
+#endif /* ! GCC_GSTAB_H */
diff --git a/gcc/gthr-aix.h b/gcc/gthr-aix.h
index 0bc1dbe5b7fc..57f04210b9a7 100644
--- a/gcc/gthr-aix.h
+++ b/gcc/gthr-aix.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_aix_h
-#define __gthr_aix_h
+#ifndef GCC_GTHR_AIX_H
+#define GCC_GTHR_AIX_H
#ifdef _THREAD_SAFE
#include "gthr-posix.h"
@@ -35,4 +35,4 @@ Boston, MA 02111-1307, USA. */
#include "gthr-single.h"
#endif
-#endif /* __gthr_aix_h */
+#endif /* GCC_GTHR_AIX_H */
diff --git a/gcc/gthr-dce.h b/gcc/gthr-dce.h
index df1b978a798f..ce77bf12915e 100644
--- a/gcc/gthr-dce.h
+++ b/gcc/gthr-dce.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_dce_h
-#define __gthr_dce_h
+#ifndef GCC_GTHR_DCE_H
+#define GCC_GTHR_DCE_H
/* DCE threads interface.
DCE threads are based on POSIX threads draft 4, and many things
@@ -486,4 +486,4 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
#undef UNUSED
-#endif /* not __gthr_dce_h */
+#endif /* ! GCC_GTHR_DCE_H */
diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h
index 1e70f7237048..7ffb0a08f54a 100644
--- a/gcc/gthr-posix.h
+++ b/gcc/gthr-posix.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_posix_h
-#define __gthr_posix_h
+#ifndef GCC_GTHR_POSIX_H
+#define GCC_GTHR_POSIX_H
/* POSIX threads specific definitions.
Easy, since the interface is just one-to-one mapping. */
@@ -500,4 +500,4 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
#endif /* _LIBOBJC */
-#endif /* not __gthr_posix_h */
+#endif /* ! GCC_GTHR_POSIX_H */
diff --git a/gcc/gthr-rtems.h b/gcc/gthr-rtems.h
index 05400c57a3ce..cb2d822abc97 100644
--- a/gcc/gthr-rtems.h
+++ b/gcc/gthr-rtems.h
@@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_rtems_h
-#define __gthr_rtems_h
+#ifndef GCC_GTHR_RTEMS_H
+#define GCC_GTHR_RTEMS_H
#define __GTHREADS 1
@@ -117,4 +117,4 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
return rtems_gxx_mutex_unlock( mutex );
}
-#endif /* __gthr_rtems_h */
+#endif /* ! GCC_GTHR_RTEMS_H */
diff --git a/gcc/gthr-single.h b/gcc/gthr-single.h
index fa7737171906..3d173b5c66e3 100644
--- a/gcc/gthr-single.h
+++ b/gcc/gthr-single.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_single_h
-#define __gthr_single_h
+#ifndef GCC_GTHR_SINGLE_H
+#define GCC_GTHR_SINGLE_H
/* Just provide compatibility for mutex handling. */
@@ -236,4 +236,4 @@ __gthread_mutex_unlock (__gthread_mutex_t * UNUSED(mutex))
#undef UNUSED
-#endif /* not __gthr_single_h */
+#endif /* ! GCC_GTHR_SINGLE_H */
diff --git a/gcc/gthr-solaris.h b/gcc/gthr-solaris.h
index fca3084f9a70..14996101824b 100644
--- a/gcc/gthr-solaris.h
+++ b/gcc/gthr-solaris.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_solaris_h
-#define __gthr_solaris_h
+#ifndef GCC_GTHR_SOLARIS_H
+#define GCC_GTHR_SOLARIS_H
/* Solaris threads as found in Solaris 2.[456].
Actually these are Unix International (UI) threads, but I don't
@@ -477,4 +477,4 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
#endif /* _LIBOBJC */
-#endif /* not __gthr_solaris_h */
+#endif /* ! GCC_GTHR_SOLARIS_H */
diff --git a/gcc/gthr-vxworks.h b/gcc/gthr-vxworks.h
index c140cf85f0eb..ce04552ac12f 100644
--- a/gcc/gthr-vxworks.h
+++ b/gcc/gthr-vxworks.h
@@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_vxworks_h
-#define __gthr_vxworks_h
+#ifndef GCC_GTHR_VXWORKS_H
+#define GCC_GTHR_VXWORKS_H
#ifdef _LIBOBJC
@@ -307,4 +307,4 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
#endif /* _LIBOBJC */
-#endif /* not __gthr_vxworks_h */
+#endif /* ! GCC_GTHR_VXWORKS_H */
diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h
index 7b991385c814..f1feb5708ee4 100644
--- a/gcc/gthr-win32.h
+++ b/gcc/gthr-win32.h
@@ -27,8 +27,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_win32_h
-#define __gthr_win32_h
+#ifndef GCC_GTHR_WIN32_H
+#define GCC_GTHR_WIN32_H
/* Windows32 threads specific definitions. The windows32 threading model
does not map well into pthread-inspired gcc's threading model, and so
@@ -492,5 +492,5 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
#endif /* _LIBOBJC */
-#endif /* not __gthr_win32_h */
+#endif /* ! GCC_GTHR_WIN32_H */
diff --git a/gcc/gthr.h b/gcc/gthr.h
index 34e80a357969..7cfa8eda2793 100644
--- a/gcc/gthr.h
+++ b/gcc/gthr.h
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-#ifndef __gthr_h
-#define __gthr_h
+#ifndef GCC_GTHR_H
+#define GCC_GTHR_H
/* If this file is compiled with threads support, it must
#define __GTHREADS 1
@@ -102,4 +102,4 @@ Boston, MA 02111-1307, USA. */
#include "gthr-single.h"
#endif
-#endif /* not __gthr_h */
+#endif /* ! GCC_GTHR_H */
diff --git a/gcc/hard-reg-set.h b/gcc/hard-reg-set.h
index 57ab2860421c..10435beec34a 100644
--- a/gcc/hard-reg-set.h
+++ b/gcc/hard-reg-set.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _HARD_REG_SET_H
-#define _HARD_REG_SET_H 1
+#ifndef GCC_HARD_REG_SET_H
+#define GCC_HARD_REG_SET_H
/* Define the type of a set of hard registers. */
@@ -475,4 +475,4 @@ extern int n_non_fixed_regs;
extern const char * reg_names[FIRST_PSEUDO_REGISTER];
-#endif /* _HARD_REG_SET_H */
+#endif /* ! GCC_HARD_REG_SET_H */
diff --git a/gcc/hwint.h b/gcc/hwint.h
index 9551dc5ccd9f..b624caf944c5 100644
--- a/gcc/hwint.h
+++ b/gcc/hwint.h
@@ -6,8 +6,8 @@
Provide definitions for macros which depend on HOST_BITS_PER_INT
and HOST_BITS_PER_LONG. */
-#ifndef __HWINT_H__
-#define __HWINT_H__
+#ifndef GCC_HWINT_H
+#define GCC_HWINT_H
/* This describes the machine the compiler is hosted on. */
#define HOST_BITS_PER_CHAR CHAR_BIT
@@ -146,4 +146,4 @@
# endif /* long long wider than long */
#endif /* ! HOST_WIDEST_INT */
-#endif /* __HWINT_H__ */
+#endif /* ! GCC_HWINT_H */
diff --git a/gcc/insn-addr.h b/gcc/insn-addr.h
index 4ae59f7fddbe..2a055e7281a8 100644
--- a/gcc/insn-addr.h
+++ b/gcc/insn-addr.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _INSN_ADDR_H
-#define _INSN_ADDR_H 1
+#ifndef GCC_INSN_ADDR_H
+#define GCC_INSN_ADDR_H
#include "varray.h"
@@ -43,4 +43,4 @@ extern int insn_current_address;
} \
} while (0)
-#endif /* _INSN_ADDR_H */
+#endif /* ! GCC_INSN_ADDR_H */
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index df340665bb2d..ff098e715297 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 d631ab383f5f..44bdc2a4cee4 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 6ce33ff67a95..cbd939bbf998 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 4203ec0853d6..4586f06093a8 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 7934b50f592a..e9c47ded8de2 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 c9157000c9a2..c11e70d9295f 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 */
diff --git a/gcc/libgcc2.h b/gcc/libgcc2.h
index 693c2f78bb63..f85a65888543 100644
--- a/gcc/libgcc2.h
+++ b/gcc/libgcc2.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __LIBGCC2_H__
-#define __LIBGCC2_H__
+#ifndef GCC_LIBGCC2_H
+#define GCC_LIBGCC2_H
extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t);
extern void __clear_cache (char *, char *);
@@ -298,4 +298,4 @@ typedef union
#include "longlong.h"
-#endif /* __LIBGCC2_H__ */
+#endif /* ! GCC_LIBGCC2_H */
diff --git a/gcc/mbchar.h b/gcc/mbchar.h
index 29f4794133f4..ab58cbbbdfab 100644
--- a/gcc/mbchar.h
+++ b/gcc/mbchar.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_MBCHAR_H__
-#define __GCC_MBCHAR_H__
+#ifndef GCC_MBCHAR_H
+#define GCC_MBCHAR_H
#ifdef MULTIBYTE_CHARS
@@ -38,4 +38,4 @@ extern int local_mb_cur_max PARAMS ((void));
/* The locale being used for multibyte characters in string/char literals. */
extern const char *literal_codeset;
#endif /* MULTIBYTE_CHARS */
-#endif
+#endif /* ! GCC_MBCHAR_H */
diff --git a/gcc/mkdeps.h b/gcc/mkdeps.h
index 2484af18f3e6..fa79b86591b5 100644
--- a/gcc/mkdeps.h
+++ b/gcc/mkdeps.h
@@ -20,8 +20,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding! */
-#ifndef __GCC_MKDEPS__
-#define __GCC_MKDEPS__
+#ifndef GCC_MKDEPS_H
+#define GCC_MKDEPS_H
/* This is the data structure used by all the functions in mkdeps.c.
It's quite straightforward, but should be treated as opaque. */
@@ -59,4 +59,4 @@ extern void deps_write PARAMS ((const struct deps *, FILE *,
automatic dependency schemes. */
extern void deps_phony_targets PARAMS ((const struct deps *, FILE *));
-#endif
+#endif /* ! GCC_MKDEPS_H */
diff --git a/gcc/params.h b/gcc/params.h
index 7fa06ff16dd3..7f0bacd43466 100644
--- a/gcc/params.h
+++ b/gcc/params.h
@@ -32,8 +32,8 @@ Boston, MA 02111-1307, USA.
Since their values can be set on the command-line, these parameters
should not be used for non-dynamic memory allocation. */
-#ifndef PARAMS_H
-#define PARAMS_H
+#ifndef GCC_PARAMS_H
+#define GCC_PARAMS_H
/* No parameter shall have this value. */
@@ -93,4 +93,4 @@ typedef enum compiler_param
#define MAX_GCSE_MEMORY \
((size_t) PARAM_VALUE (PARAM_MAX_GCSE_MEMORY))
-#endif /* PARAMS_H */
+#endif /* ! GCC_PARAMS_H */
diff --git a/gcc/prefix.h b/gcc/prefix.h
index b7c36487a55f..03c0d191fc25 100644
--- a/gcc/prefix.h
+++ b/gcc/prefix.h
@@ -19,10 +19,10 @@ Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_PREFIX_H__
-#define __GCC_PREFIX_H__
+#ifndef GCC_PREFIX_H
+#define GCC_PREFIX_H
extern const char *update_path PARAMS ((const char *, const char *));
extern void set_std_prefix PARAMS ((const char *, int));
-#endif /* ! __GCC_PREFIX_H__ */
+#endif /* ! GCC_PREFIX_H */
diff --git a/gcc/real.h b/gcc/real.h
index 58cae6ffed4a..04c7485e1dcd 100644
--- a/gcc/real.h
+++ b/gcc/real.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef REAL_H_INCLUDED
-#define REAL_H_INCLUDED
+#ifndef GCC_REAL_H
+#define GCC_REAL_H
/* Define codes for all the float formats that we know of. */
#define UNKNOWN_FLOAT_FORMAT 0
@@ -481,4 +481,4 @@ extern int target_negative PARAMS ((REAL_VALUE_TYPE));
extern void debug_real PARAMS ((REAL_VALUE_TYPE));
extern REAL_VALUE_TYPE ereal_atof PARAMS ((const char *, enum machine_mode));
-#endif /* Not REAL_H_INCLUDED */
+#endif /* ! GCC_REAL_H */
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 44c61ef863ea..648aa13cb702 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _RTL_H
-#define _RTL_H
+#ifndef GCC_RTL_H
+#define GCC_RTL_H
struct function;
@@ -2022,4 +2022,4 @@ extern void regrename_optimize PARAMS ((void));
/* In condexec.c */
extern void if_convert PARAMS ((int));
-#endif /* _RTL_H */
+#endif /* ! GCC_RTL_H */
diff --git a/gcc/sbitmap.h b/gcc/sbitmap.h
index 125979bedc58..0aa57a9c967d 100644
--- a/gcc/sbitmap.h
+++ b/gcc/sbitmap.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _SBITMAP_H
-#define _SBITMAP_H 1
+#ifndef GCC_SBITMAP_H
+#define GCC_SBITMAP_H
/* It's not clear yet whether using bitmap.[ch] will be a win.
It should be straightforward to convert so for now we keep things simple
@@ -136,4 +136,4 @@ extern void sbitmap_union_of_succs PARAMS ((sbitmap, sbitmap *, int));
extern void sbitmap_union_of_preds PARAMS ((sbitmap, sbitmap *, int));
extern void debug_sbitmap PARAMS ((sbitmap));
-#endif /* _SBITMAP_H */
+#endif /* ! GCC_SBITMAP_H */
diff --git a/gcc/system.h b/gcc/system.h
index 6ef07a3992c5..be9c81bdfdca 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -20,8 +20,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_SYSTEM_H__
-#define __GCC_SYSTEM_H__
+#ifndef GCC_SYSTEM_H
+#define GCC_SYSTEM_H
/* This is the location of the online document giving information how
to report bugs. If you change this string, also check for strings
@@ -557,4 +557,4 @@ typedef char _Bool;
#endif /* GCC >= 3.0 */
-#endif /* __GCC_SYSTEM_H__ */
+#endif /* ! GCC_SYSTEM_H */
diff --git a/gcc/timevar.h b/gcc/timevar.h
index e20a26e5293c..187b60e3cb8b 100644
--- a/gcc/timevar.h
+++ b/gcc/timevar.h
@@ -88,4 +88,4 @@ extern void timevar_print PARAMS ((FILE *));
extern long get_run_time PARAMS ((void));
extern void print_time PARAMS ((const char *, long));
-#endif
+#endif /* ! GCC_TIMEVAR_H */
diff --git a/gcc/toplev.h b/gcc/toplev.h
index ef411bbdc23c..7d79d53a027f 100644
--- a/gcc/toplev.h
+++ b/gcc/toplev.h
@@ -18,8 +18,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_TOPLEV_H__
-#define __GCC_TOPLEV_H__
+#ifndef GCC_TOPLEV_H
+#define GCC_TOPLEV_H
#ifdef ANSI_PROTOTYPES
union tree_node;
@@ -188,4 +188,4 @@ extern void set_no_fast_math_flags PARAMS ((void));
extern int exact_log2_wide PARAMS ((unsigned HOST_WIDE_INT));
extern int floor_log2_wide PARAMS ((unsigned HOST_WIDE_INT));
-#endif /* __GCC_TOPLEV_H */
+#endif /* ! GCC_TOPLEV_H */
diff --git a/gcc/tradcpp.h b/gcc/tradcpp.h
index d5ec19e57988..0c16cfa0c74a 100644
--- a/gcc/tradcpp.h
+++ b/gcc/tradcpp.h
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifndef _TRADCPP_H_
-#define _TRADCPP_H_
+#ifndef GCC_TRADCPP_H
+#define GCC_TRADCPP_H
extern void error PARAMS ((const char *msgid, ...)) ATTRIBUTE_PRINTF_1;
extern void warning PARAMS ((const char *msgid, ...)) ATTRIBUTE_PRINTF_1;
@@ -41,4 +41,4 @@ extern int test_assertion PARAMS ((unsigned char **));
#define is_space(x) ISSPACE(x)
#define is_nvspace(x) (IS_NVSPACE(x) && x != '\0')
-#endif /* ! _TRADCPP_H_ */
+#endif /* ! GCC_TRADCPP_H */
diff --git a/gcc/tsystem.h b/gcc/tsystem.h
index 4c21f810f1b2..6e83b431f711 100644
--- a/gcc/tsystem.h
+++ b/gcc/tsystem.h
@@ -19,8 +19,8 @@ along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef __GCC_TSYSTEM_H__
-#define __GCC_TSYSTEM_H__
+#ifndef GCC_TSYSTEM_H
+#define GCC_TSYSTEM_H
/* System headers (e.g. stdio.h, stdlib.h, unistd.h) sometimes
indirectly include getopt.h. Our -I flags will cause gcc's gnu
@@ -94,4 +94,4 @@ extern int errno;
#define NULL 0
#endif
-#endif /* __GCC_TSYSTEM_H__ */
+#endif /* ! GCC_TSYSTEM_H */
diff --git a/gcc/varray.h b/gcc/varray.h
index 1456ffebe456..a50eedc68036 100644
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -19,14 +19,14 @@
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifndef _VARRAY_H_
-#define _VARRAY_H_
+#ifndef GCC_VARRAY_H
+#define GCC_VARRAY_H
#ifndef HOST_WIDE_INT
#include "machmode.h"
#endif
-#ifndef __GCC_SYSTEM_H__
+#ifndef GCC_SYSTEM_H
#include "system.h"
#endif
@@ -271,4 +271,4 @@ extern void varray_check_failed PARAMS ((varray_type, size_t,
#define VARRAY_TOP_CONST_EQUIV(VA) VARRAY_TOP (VA, const_equiv)
#define VARRAY_TOP_BB(VA) VARRAY_TOP (VA, bb)
-#endif /* _VARRAY_H_ */
+#endif /* ! GCC_VARRAY_H */
diff --git a/gcc/version.h b/gcc/version.h
index b7bb57059efa..99416495a4f1 100644
--- a/gcc/version.h
+++ b/gcc/version.h
@@ -1,4 +1,4 @@
-#ifndef __GCC_VERSION_H__
-#define __GCC_VERSION_H__
+#ifndef GCC_VERSION_H
+#define GCC_VERSION_H
extern const char *const version_string;
-#endif /* __GCC_VERSION_H__ */
+#endif /* ! GCC_VERSION_H */
--
GitLab