Standardize header guards.

From-SVN: r42615

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2cd17a1effeb737fc724fb352bb4574a3e361e90..381e456d050d6fbee84da447694a066bc2850498 100644 (file)
--- 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 f3911c8f518c42d7f8c1836e867509e747fa6018..8ffcbce368ba876db9d0bb10539a7ecd71232294 100644 (file)
--- 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 d96e793a34941df5ab8b5c1ecc0b492adc105e9a..0eb5992707302586a604191e960e31cc185e0e50 100644 (file)
--- 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 c1b273e6e30177fb32edd3c316518a7344a1bd81..8625c9138385911b14c145d3bd8c90fae02140df 100644 (file)
--- 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 bb246ceea47a6f224fa9417404fbd2c4875aacb7..5afdee62bbf67cb537e913e36610a65dc19addd8 100644 (file)
--- 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 2ca4e864817c319b6196edf7ef84651ecc3e57a2..e2929f426252cf599081022c4f4087f5ab7b3ce2 100644 (file)
--- 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 e6af073dfad1840b643d9b4ab441c7596ec46f90..d15c3e5d35a8c83f1e90f2b084f2c0255327c9ee 100644 (file)
--- 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 8264ebd06901d92c10f4f76bd4b1e107ae6fcdad..508567a91d9641cf2e29ef86f38199c1545e51ee 100644 (file)
--- 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 912bca318620372a33fc21eee11f8a6a1d221ac8..30775c61f5978caff24a293f8fdc5e97dfcbff76 100644 (file)
--- 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 4d652b1eb2b38acca6c9ae28b82390d0af19664f..d38445bb0f43b56e75e807ca1308dcafc0f836e6 100644 (file)
--- 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 7650c2f8cc9197e17e250123d19ebe9dc3e61f44..2a899fdfedb41cc50a7ece4b271a5bdc4082d6bc 100644 (file)
--- 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 87c06f59ea662f933263c7fb8156494c017a8b97..d23ca0840a951ba7c0dee71365ab44839dbc3d54 100644 (file)
--- 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 8f9376137fe9721cc83afd70584683e5f5745635..9d0664ea069e9f7f378964ded870722a904c788c 100644 (file)
--- 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 17fe5406e7d25b4e756d245355c2e43b5b049b2f..073672fb4270d79dab1ac5a9306a9c487f524e23 100644 (file)
--- 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 6449aa726506ed36313fee7aeda7669f441d75f3..4ea5c8beb35a0111a175899ca2804ed6bb50afd1 100644 (file)
--- 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 8a2c266a82f155f960b41aae08290bacc1aa8948..c1490aeb713b74c27fd1a29d3768cd2cda270423 100644 (file)
--- 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 f4471f9067a0a6182b2f88220421dc8f6c2c09c4..3bd8ba84dbda05c5c99c7a21b8b286baadcb9d28 100644 (file)
--- 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 1535b29c6f2e05816c7f096307d94d1f137dcacf..e33d4635fd20d4ff1c634e6294b5ae8792d0c60a 100644 (file)
--- 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 68747ac92ba09a744ff897f2ed2552bfb1deda1f..d633757ce5811d0ca00e24f7c8918175bcad7455 100644 (file)
--- 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 7ee1d3ff6e1b116bc1f0f8592608de492dcda647..872ad7f6374d0d680b98fe1455811de3094f77b9 100644 (file)
--- 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 6bb638b95a5bd969771af5bf61f31faeca8078d3..4f65617ec36f798406ef9f4f692bdc52af088515 100644 (file)
--- 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 130dddeefe400d35734441dc75bd21551b3ffb2c..629f2c175c9e61e86720e1c0c47c250b9c4ad286 100644 (file)
--- 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 a6eb358a737177cb3372da9f9e0a48929265527d..94816e959386618faa0926736d334d25743b0813 100644 (file)
--- 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 826cd5e1b6a080f6012c7e7a49f63e5e339e27f6..2cc8166b6bfda59f0d06d6f76f22cce14f72f8c1 100644 (file)
--- 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 79b66773f842cc191f224fb4aca5e7d8d3e94c5b..2ccaa724fdeed77e63a5bd0994c2a83ba5cf78a6 100644 (file)
--- 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 b6a21f46ba8f04fbf43d6cfc4471a9a926755947..5bda01daba800257c8dc950149a0c61b3d0c62f2 100644 (file)
--- 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 8bc38711961784daaddc0919b096a1c097ae0bf2..1ff65e5f72a958c0554cc82f66dccacd0d82b967 100644 (file)
--- 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 5380d1e1f798f2bf3c21e0469fc53059bfcbdf79..09632e7e5dae5f5423d46f3cd15a0488c50ce1dc 100644 (file)
--- 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 bf9bd893529b5181e789a95b3ada52cdf7c1d3a8..e8ab9483fe23e357121d2269bc2ea6b0db9ad727 100644 (file)
--- 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 e5065e4cec6b76adb73fb17c237d5380b24181ea..e820303243ce74f75a5312ee2f500fc43b36565f 100644 (file)
--- 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 f5f7d454cf7e44df8fdae6efc9b6c4f9e623d49f..9f86833777b8980a4e58a4fcc336d47573f0f870 100644 (file)
--- 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 db7063cd662d758657971bd0ef51f1d2d3f9ffdf..8ee6a1fda5ead17c18f2246acfc2a05195f9b693 100644 (file)
--- 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 17438c7a4e42ab4db348b366b1c36ce87268dc87..56d90681dcbbcccb2848fe1d7cc13b903db9e2cf 100644 (file)
--- 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 bfc6a3fb6cd11046bb042ddde33a3700b732b7d4..c05b5e2e431be5ba0ed77c8d9ffcd1d7bdd492bd 100644 (file)
--- 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 3b8d0a17c495cb70baafa008eea730e9912aef7c..2989b6674eef3f873d2024953bd417011ca4c28f 100644 (file)
--- 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 68092adee3f36d8ab7bc9cedff179968cef79a05..9d017584aaff35d7cba83f00639fb031ce91ef5d 100644 (file)
--- 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 d9988f6525645fc2c03bb6fea41b4f4916c04561..afb519a09300edd6d82491a972f05bca691a262d 100644 (file)
--- 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 2720241d9a65c3b44f803aef34bb7e5cdd8cd72c..1671cf67b5c5d75753639819b483e7d580895d0e 100644 (file)
--- 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 210229cd885d2d2a7fa3161eca8339d3aace4bde..95942e7070a78277fabd47532718dc213287f970 100644 (file)
--- 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 734022370cd172069ef135f527b42503fbd2fe1d..8589943cc4604061da27679ec3ae90cead11a8a2 100644 (file)
--- 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 a2acc25a9e905edbaf1dc5fd84f200703b44ed38..6b559efe668ea614ef35be324448cfa4968be4b1 100644 (file)
--- 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 ddbd44841e7bb30325d0eb2f0f035b95388067b2..3347b1cd92fb0a9464c175a173a699f8529146b1 100644 (file)
--- 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 07abfb06d067f02f75d79b30b9a7d544f77f0722..a0d08b1736a286bac0cf204c755a2e461463bd88 100644 (file)
--- 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 666612e3964e547c58f1002c8325db7354dc5712..a99369d0b0407b0076d9a5178a32018dfaa17294 100644 (file)
--- 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 0a0ce92f423649e785784f07430e1baa094b48a8..f3d2c858d43d90d5615a438f691bfbc08328a112 100644 (file)
--- 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 3f781f91904af7e8e5be3de2a34542b4c7791584..b82173bbf0e7453e2c3659853e1952df02164894 100644 (file)
--- 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 eaf99214b8c4597451bc319814b527a279311041..5ab67417bb17d64a8e64ce577bb27e213fcbccd2 100644 (file)
--- 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 ae9665384918667b684cd4d7e5600d29144671da..44fbfac4e4fa1d0bb6aea3bbe2150be4967a97dc 100644 (file)
--- 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 bbf4e94930dddd445688d094d3915225137068ee..69defd27ab633f0e61e692dc913d3ea2e4392362 100644 (file)
--- 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 d6cca3b9f7930faa2764aec75d1aaf3dd2bfbcdd..76b59dca3fb8fcf829a5c6aa8c6932fc745a6b9b 100644 (file)
--- 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 09f1291ed5e466a0cd55abbfe5bd7269e16bd591..fba3808ec8e2361948e69225d0402c8411330005 100644 (file)
--- 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 c82a9c86b9486a088f522a2e82daaea7ac8382d1..a28d0ac1691d25e211101b19681d2079a96ad14c 100644 (file)
--- 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 d9efdf281dabdd956854880a345699937f833962..1c827209f2c9101b4f1861c3a1f65637d94a5e42 100644 (file)
--- 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 6c3499f07e0670a105f9a08c076c56ad951bd9db..4b18805d3d0a55e06e7d101f674c9f335478d288 100644 (file)
--- 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 4e6a06e5592e2aa737e0f8968932fe9ab9175662..fd4a65cc59f80988af930b3c7a2988ae7ae83546 100644 (file)
--- 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 666bd853056d7f00f533d1aed2606dd07e64b056..ce5843eaa0e240d23ec945ce6a6d07d089210d53 100644 (file)
--- 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 cfcc7bee6a92c0d172135b26b2f020b033dee299..65b99f9bbfee80aa43eafe45cd7c4846ce28462c 100644 (file)
--- 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 64e16079815a197608606c41539d91627ade9446..cf417771557879ce3fbd435a154873b0bef04416 100644 (file)
--- 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 6ee761d588cf7f607fbd08d9eedd75567eadea63..a9b3acc586c7748a469d3026342d21d3db446e3c 100644 (file)
--- 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 12b4783f442d39276743d1a4915d6852c4ee723f..8b2f7c3aafe5c5cd1d1b7cadab4da980693ce09c 100644 (file)
--- 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 bfad671bb25ad56e83d352359acc157c4ba3432d..ea8292cc8dcc0f477ea7642b7f2de61fab57f1c0 100644 (file)
--- 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 78e98818b0905de7dd2e6bf3671225b2fc18a45a..a4473578e4161467e1c9367ba9f69821aa2f1dd6 100644 (file)
--- 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 bc5c9e6ad142a66775978bfbf0c1970e4786ba91..e4aa4046db707a6ccc4da3e50a5c546a8a37730f 100644 (file)
--- 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 d995cf0079e360f70bf3bde7def5e1024a78d72c..eca8d0d563daf97b08fe4ab9fb08135443f626d4 100644 (file)
--- 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 1ed1228e35d9bbb0fec1dd43043a0f0b81aebc86..543eeeb7c90e3b83ea23af1de7eeee5b38982dae 100644 (file)
--- 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 e1448cdc5fb98e7e3de31590f42260705c282267..3ca494d81de53afcb9f5270ac1c573bf764e93c5 100644 (file)
--- 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 341daa7a41d498d1bef9e2912031894519376532..e56e843fe30e013664d4b4ec53222baa5f252b69 100644 (file)
--- 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 b9d9d521f34adfcdd989fc31efdbf7e06d7f5e5d..e01b741b389d8c74434d8912f94401a4cfa29c9b 100644 (file)
--- 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 22b177e027a16f780f412b39077f898e88e422a4..a3f959f46086181a80627bd8544f745381acbd91 100644 (file)
--- 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 554d047e611cb9470654b6e1333f7a4aba54be95..826e941e44712f3a0304494f4f203bdd5c2b9ba9 100644 (file)
--- 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 0c7262cd0a6d885a320e34e0762bb707d2f20706..cc8b1c0eb2ddd25a743f4e958e6cd7b93104b38a 100644 (file)
--- 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 7eab1067ca74a70d601bcae2a1c47cc01e283359..5ce663d5a3474f6cca8971d541d667d014e6f04d 100644 (file)
--- 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 e15449751b92d717a775de8c63133b2d2d3f3046..eb820fe9dbf0b12ee2b5b83aa586d67ef06a5df0 100644 (file)
--- 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 aaae51e6565bae43788581c23277b7ffc7804ad7..9e3bd801e19aa5a60702786eb398d95bdfa6bf23 100644 (file)
--- 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 62f941d25d322311b9e5095843546bc582b8f8d2..c612071ddbecc1a0db2e089b8ab6258455891c06 100644 (file)
--- 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 a6a3e1c15f73cc6b275e6e22ff7882d6e577dc42..a3adb4bda6b754fd9193f5a4c5ee13a5671ec54b 100644 (file)
--- 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 e42c43d2ba6b06d84c8001b47363ff4eeb738eae..6bcc6e2c6668a7e50f261dc45521f98869dc07af 100644 (file)
--- 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 c3ed6c7245fb3f81ee3bcced846d17edbb148b0e..c27a51eb493fbe1309dcb88c6904f7ac6d93724a 100644 (file)
--- 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 92492ac439e53a8c21217fad90b6a16dda84705e..46168a0269fbcc169c658d575a7cc7ee03998624 100644 (file)
--- 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 d92db458ceafb52cde4902e2ac02dd1b17454883..62526769d8691f29873d256c9c72d4c36efb72b5 100644 (file)
--- 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 0cb93f5e5113efdb658091501d84812a74498693..48f83aa00d1fc38774426fb45da3b135087c96b4 100644 (file)
--- 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 9f65b40aacb82606223930b0b74851ade3c5ed82..2bbbb154d15056cd7f99a4463bb05bda82848c92 100644 (file)
--- 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 80bd594a36aa19839ded47735a8f7ee95446346d..ed510c164617ed5d7236580862a7c3a3e83e8c5a 100644 (file)
--- 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 0bc1dbe5b7fc1748e770a167687ec15e1e9596cf..57f04210b9a7548429dd416795d887da48f35b0e 100644 (file)
--- 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 df1b978a798f6843908ccef4451873627c2434ff..ce77bf12915e175aba863eca692acd1357ccd250 100644 (file)
--- 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 1e70f7237048e6e67885a4e0bc703317bd5c2a33..7ffb0a08f54ad5c704076df800d39f046905d981 100644 (file)
--- 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 05400c57a3ce1a650310079040502a3778dacc2e..cb2d822abc972b2ac50223569d5738e957307dd6 100644 (file)
--- 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 fa7737171906aaac2edde86d1201c46a77170543..3d173b5c66e3313eb5818d72c132d4c8b1351aba 100644 (file)
--- 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 fca3084f9a70599280438f3223875973701a7edc..14996101824bd00c8a6cce6e7d79ec4d234936ae 100644 (file)
--- 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 c140cf85f0eb739f40014b5226e9a7ec4c79e55d..ce04552ac12f9d997d12d00c803b0dc23dd9ce2d 100644 (file)
--- 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 7b991385c81443398a1e710c439cf2cb26d097fb..f1feb5708ee46ca859d5c6e9fcdbaa8eef403a3d 100644 (file)
--- 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 34e80a3579693a7b2acbfaafe5483c525d420a09..7cfa8eda279380367e4b56b1bf3651b8f16895a7 100644 (file)
--- 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 57ab2860421c5d4f2040344013242dc704250d5c..10435beec34a7a4d81fc8fd91f0f7cbfc8502be9 100644 (file)
--- 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 9551dc5ccd9f2d035f43e5efe35319ef94e04367..b624caf944c542ad735a66cc42b31c4c5ed8210d 100644 (file)
--- 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 4ae59f7fddbea17cc95e01ca20d89d8a38aaad90..2a055e7281a83ab49f862bc706ee6c56ad52a932 100644 (file)
--- 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 df340665bb2d34a12f33a1833f5e156cd51c24d8..ff098e71529738abb23deaf40d24183255693538 100644 (file)
--- 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 d631ab383f5f4de285a9e8f64e84df8a9fa567cb..44bdc2a4cee4323a3a1875cce16d8906c89a8898 100644 (file)
--- 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 6ce33ff67a95c349841aed3e76aa5e57442772e3..cbd939bbf9985526bf1d7c93dd302b6a38bcb3d0 100644 (file)
--- 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 4203ec0853d67bbd9a65165f6c221f1994dd8253..4586f06093a8df72ec8478e715dfff3c9324b70e 100644 (file)
--- 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 7934b50f592a0b64933522f7fa5ea92d309890ad..e9c47ded8de23b15234403bc9c3f2a3360ea5ec0 100644 (file)
--- 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 c9157000c9a2c9d4546df5f6e5d70b21b7ef6240..c11e70d9295f2efa27a547fdde59d5d485f38d3e 100644 (file)
--- 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 693c2f78bb63ced2836cac9162e93e30b9100e81..f85a6588854351761ad970dd30647b2f43f298c6 100644 (file)
--- 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 29f4794133f479b2e7679a3be2612f9bcbbc9510..ab58cbbbdfabbf0264d7e011bf879457054eba58 100644 (file)
--- 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 2484af18f3e677d7e0517253bc7468a9b36e0dba..fa79b86591b5ca0f9a133234e90809b51f332648 100644 (file)
--- 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 7fa06ff16dd32c0eac399a1085c6670e2023e920..7f0bacd4346634e78746683c57cbcd2f2b1c21c8 100644 (file)
--- 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 b7c36487a55f22e30366ab8d6ad5947a62b591aa..03c0d191fc25e04691672ba550852d9cfaf6e82c 100644 (file)
--- 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 58cae6ffed4a48ae79f8eb9f955f69cc06c07b34..04c7485e1dcdd1e6f83cb72ff8b93892f25c8f9c 100644 (file)
--- 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 44c61ef863ea67055e342d7b494b736856a45e2d..648aa13cb7025231e936f44910fef6cc6a4311ff 100644 (file)
--- 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 125979bedc588cb5fd7e1440d25008a3aa9ffbea..0aa57a9c967dc0a34390f815e8757ad70f527192 100644 (file)
--- 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 6ef07a3992c5720d5bde8870bf7452b3c39473ea..be9c81bdfdcad15e76592f3377af69c5bd4bb75a 100644 (file)
--- 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 e20a26e5293c391c5d611c8dd377b0279e2f1945..187b60e3cb8b7c702605101a3d56e09cefd98197 100644 (file)
--- 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 ef411bbdc23cf3d6b08f37ead19d0168a8883f7f..7d79d53a027fad12eeebfe91ed28f41d530d7494 100644 (file)
--- 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 d5ec19e57988e32a73df550c8ff471c2907bbcdc..0c16cfa0c74a29d17a36c9734b6ade285f8f9675 100644 (file)
--- 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 4c21f810f1b2c39c94e75e4349a4cf733a7498e2..6e83b431f7114ee0435b5b631db643b8a47388b6 100644 (file)
--- 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 1456ffebe456d4d9a380dff2785429212a5c6a5f..a50eedc68036fc30c137cee852d18206e025a3d2 100644 (file)
--- 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 b7bb57059efabffd06330fd585d187e4482ed716..99416495a4f180adade0c3b13581c9830603c238 100644 (file)
--- 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 */