Standardize header guards.

From-SVN: r42615

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.

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
+#ifndef GCC_BASIC_BLOCK_H
-#define _BASIC_BLOCK_H 1
+#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 */

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
+#ifndef GCC_BITMAP_H
-#define _BITMAP_H 1
+#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 */

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 */

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 */

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
+#ifndef GCC_C_LEX_H
-#define _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 */

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
+#ifndef GCC_C_PRAGMA_H
-#define _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 */

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
+#ifndef GCC_C_TREE_H
-#define _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 */

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

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
+#ifndef GCC_CH_TREE_H
-#define _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 */

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
+#ifndef GCC_TASKING_H
-#define _CH_TASKING_H
+#define GCC_TASKING_H
 
 /* list of this module's process, buffer, etc. decls */
 extern tree tasking_list;
 
-#endif
+#endif /* ! GCC_TASKING_H */

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__
+#ifndef GCC_COLLECT2_H
-#define __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 */

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 */

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__
+#ifndef GCC_ARM_H
-#define __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 */

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 */

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
+#ifndef GCC_DBX_ELF_H
-#define __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 */

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__
+#ifndef GCC_FP_BIT_H
-#define __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 */

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 */

gcc/config/h8300/h8300.h

@@ -1485,4 +1485,4 @@ readonly_data ()							\
 
 #define MOVE_RATIO 3
 
-#endif /* GCC_H8300_H */
+#endif /* ! GCC_H8300_H */

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 */

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__
+#ifndef GCC_I370_H
-#define __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 */

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  */

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
+#ifndef GCC_MCORE_H
-#define __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 */

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__
+#ifndef GCC_MIPS_PROTOS_H
-#define __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 */

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 */

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 */

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 */

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 */

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.
 

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
+#ifndef GCC_CP_TREE_H
-#define _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 */

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
+#ifndef GCC_CP_LEX_H
-#define _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 */

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__
+#ifndef GCC_CPPDEFAULT_H
-#define __GCC_CPPDEFAULT__
+#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 */

gcc/cpphash.h

@@ -514,4 +514,4 @@ ufputs (s, f)
   return fputs ((const char *)s, f);
 }
 
-#endif /* GCC_CPPHASH_H */
+#endif /* ! GCC_CPPHASH_H */

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 */

gcc/defaults.h

@@ -351,5 +351,4 @@ do {								\
 #define MD_INIT_BUILTINS
 #endif
 
-#endif  /* GCC_DEFAULTS_H */
+#endif  /* ! GCC_DEFAULTS_H */
-

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__
+#ifndef GCC_DIAGNOSTIC_H
-#define __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 */

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__
+#ifndef GCC_ERRORS_H
-#define __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 */

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
 

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.

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
+#ifndef GCC_F_BAD_H
-#define _H_f_bad
+#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 */

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
+#ifndef GCC_F_BIT_H
-#define _H_f_bit
+#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 */

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
+#ifndef GCC_F_BLD_H
-#define _H_f_bld
+#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 */

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
+#ifndef GCC_F_COM_H
-#define _H_f_com
+#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 */

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
+#ifndef GCC_F_DATA_H
-#define _H_f_data
+#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 */

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
+#ifndef GCC_F_EQUIV_H
-#define _H_f_equiv
+#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 */

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
+#ifndef GCC_F_EXPR_H
-#define _H_f_expr
+#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 */

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
+#ifndef GCC_F_GLOBAL_H
-#define _H_f_global
+#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 */
+ 

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
+#ifndef GCC_F_IMPLIC_H
-#define _H_f_implic
+#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 */

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
+#ifndef GCC_F_INFO_H
-#define _H_f_info
+#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 */

gcc/f/intrin.h

@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 */
 
-#ifndef _H_f_intrin
+#ifndef GCC_F_INTRIN_H
-#define _H_f_intrin
+#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 */

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
+#ifndef GCC_F_LAB_H
-#define _H_f_lab
+#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 */

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
+#ifndef GCC_F_LEX_H
-#define _H_f_lex
+#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 */

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
+#ifndef GCC_F_MALLOC_H
-#define _H_f_malloc
+#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 */

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
+#ifndef GCC_F_NAME_H
-#define _H_f_name
+#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 */

gcc/f/proj.h

@@ -21,8 +21,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 */
 
-#ifndef _H_f_proj
+#ifndef GCC_F_PROJ_H
-#define _H_f_proj
+#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 */

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
+#ifndef GCC_F_SRC_H
-#define _H_f_src
+#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 */

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
+#ifndef GCC_F_ST_H
-#define _H_f_st
+#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 */

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
+#ifndef GCC_F_STA_H
-#define _H_f_sta
+#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 */

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
+#ifndef GCC_F_STB_H
-#define _H_f_stb
+#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 */

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
+#ifndef GCC_F_STC_H
-#define _H_f_stc
+#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 */

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
+#ifndef GCC_F_STD_H
-#define _H_f_std
+#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 */

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
+#ifndef GCC_F_STE_H
-#define _H_f_ste
+#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 */

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
+#ifndef GCC_F_STORAG_H
-#define _H_f_storag
+#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 */

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
+#ifndef GCC_F_STP_H
-#define _H_f_stp
+#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 */

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
+#ifndef GCC_F_STR_H
-#define _H_f_str
+#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 */

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
+#ifndef GCC_F_STS_H
-#define _H_f_sts
+#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 */

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
+#ifndef GCC_F_STT_H
-#define _H_f_stt
+#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 */

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
+#ifndef GCC_F_STU_H
-#define _H_f_stu
+#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 */

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
+#ifndef GCC_F_STV_H
-#define _H_f_stv
+#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 */

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
+#ifndef GCC_F_STW_H
-#define _H_f_stw
+#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 */

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
+#ifndef GCC_F_SYMBOL_H
-#define _H_f_symbol
+#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 */

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
+#ifndef GCC_F_TARGET_H
-#define _H_f_target
+#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 */

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
+#ifndef GCC_F_TOP_H
-#define _H_f_parse
+#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 */

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
+#ifndef GCC_F_TYPE_H
-#define _H_f_type
+#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 */

gcc/f/version.h

@@ -1,6 +1,6 @@
-#ifndef _H_f_version
+#ifndef GCC_F_VERSION_H
-#define _H_f_version
+#define GCC_F_VERSION_H
 
 extern const char *ffe_version_string;
 
-#endif
+#endif /* ! GCC_F_VERSION_H */

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
+#ifndef GCC_F_WHERE_H
-#define _H_f_where
+#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 */

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
+#ifndef GCC_FIXLIB_H
-#define FIXINCLUDES_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 */

gcc/fixinc/server.h

@@ -46,8 +46,8 @@
  * If you do not wish that, delete this exception notice.
  */
 
-#ifndef FIXINC_SERVER_H
+#ifndef GCC_SERVER_H
-#define FIXINC_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 */

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 */

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__
+#ifndef GCC_GCC_H
-#define __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 */

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
+#ifndef GCC_GCOV_IO_H
-#define 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 */

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__
+#ifndef GCC_GRAPH_H
-#define __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 */

gcc/gstab.h

@@ -1,8 +1,5 @@
-#ifndef __GNU_STAB__
+#ifndef GCC_GSTAB_H
-
+#define GCC_GSTAB_H
-/* Indicate the GNU stab.h is in use.  */
-
-#define __GNU_STAB__
 
 #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 */

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
+#ifndef GCC_GTHR_AIX_H
-#define __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 */

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
+#ifndef GCC_GTHR_DCE_H
-#define __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 */

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
+#ifndef GCC_GTHR_POSIX_H
-#define __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 */

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
+#ifndef GCC_GTHR_RTEMS_H
-#define __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 */

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
+#ifndef GCC_GTHR_SINGLE_H
-#define __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 */

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
+#ifndef GCC_GTHR_SOLARIS_H
-#define __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 */

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
+#ifndef GCC_GTHR_VXWORKS_H
-#define __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 */

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
+#ifndef GCC_GTHR_WIN32_H
-#define __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 */
 

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
+#ifndef GCC_GTHR_H
-#define __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 */

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
+#ifndef GCC_HARD_REG_SET_H
-#define _HARD_REG_SET_H 1
+#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 */

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__
+#ifndef GCC_HWINT_H
-#define __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 */

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
+#ifndef GCC_INSN_ADDR_H
-#define _INSN_ADDR_H 1
+#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 */

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.

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 "#ifndef GCC_CHARTABLES_H\n";
-    print OUT "#define CHARTABLES_H\n\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);
 

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
+#ifndef GCC_JAVAOP_H
-#define 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 */

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
+#ifndef GCC_JCF_H
-#define 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 */

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
+#ifndef GCC_JAVA_LEX_H
-#define JV_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 */