Defeat -I-

ENH: Switch offending header files to use angle brackets instead of quotation marks so that the include behavior is defined by the C spec. This was done to eliminate the reliance on the deprecated compiler option -I- when header file names collided between the current directory of a source file and the desired include path.

sr_port/bx_boolop.c

@@ -14,7 +14,7 @@
 #include "opcode.h"
 #include "mdq.h"
 #include "mmemory.h"
-#include "emit_code.h"
+#include <emit_code.h>
 #include "fullbool.h"
 
 LITREF		octabstruct	oc_tab[];

sr_port/cert_blk.c

@@ -35,7 +35,7 @@
 #include "cert_blk.h"
 #include "gtm_ctype.h"
 #ifdef GTM_TRIGGER
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #endif
 

sr_port/code_gen.c

@@ -18,7 +18,7 @@
 #include "rtnhdr.h"
 #include "obj_file.h"
 #include "list_file.h"
-#include "emit_code.h"
+#include <emit_code.h>
 #include "dumptable.h"
 
 LITREF	octabstruct	oc_tab[];	/* op-code table */

sr_port/dse_adrec.c

@@ -9,34 +9,34 @@
  *								*
  ****************************************************************/
 
-#include "mdef.h"
+#include <mdef.h>
 
-#include "gtm_string.h"
-#include "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "gdsblk.h"
+#include <gtm_string.h>
+#include <gdsroot.h>
+#include <gtm_facility.h>
+#include <fileinfo.h>
+#include <gdsbt.h>
+#include <gdsfhead.h>
+#include <gdsblk.h>
 #include "min_max.h"		/* needed for gdsblkops.h */
-#include "gdsblkops.h"
-#include "gdscc.h"
-#include "cli.h"
-#include "copy.h"
-#include "filestruct.h"
-#include "jnl.h"
-#include "skan_offset.h"
-#include "skan_rnum.h"
-#include "dse.h"
+#include <gdsblkops.h>
+#include <gdscc.h>
+#include <cli.h>
+#include <copy.h>
+#include <filestruct.h>
+#include <jnl.h>
+#include <skan_offset.h>
+#include <skan_rnum.h>
+#include <dse.h>
 
 /* Include prototypes */
-#include "t_qread.h"
-#include "t_write.h"
-#include "t_end.h"
-#include "t_begin_crit.h"
-#include "gvcst_blk_build.h"
-#include "util.h"
-#include "t_abort.h"
+#include <t_qread.h>
+#include <t_write.h>
+#include <t_end.h>
+#include <t_begin_crit.h>
+#include <gvcst_blk_build.h>
+#include <util.h>
+#include <t_abort.h>
 
 GBLREF char		*update_array, *update_array_ptr;
 GBLREF uint4		update_array_size;

sr_port/emit_code.c

@@ -29,7 +29,7 @@
 #include "obj_file.h"
 #include "list_file.h"
 #include "min_max.h"
-#include "emit_code.h"
+#include <emit_code.h>
 #ifdef UNIX
 #include "xfer_enum.h"
 #endif

sr_port/op_zgoto.c

@@ -20,7 +20,7 @@
 #include "flush_jmp.h"
 #include "dollar_zlevel.h"
 #include "golevel.h"
-#include "auto_zlink.h"
+#include <auto_zlink.h>
 #include "error.h"
 #include "gtmimagename.h"
 #ifdef UNIX

sr_port/shrink_trips.c

@@ -19,7 +19,7 @@
 #include "cgp.h"
 #include "gtmdbglvl.h"
 #include "cdbg_dump.h"
-#include "emit_code.h"
+#include <emit_code.h>
 #include "rtnhdr.h"
 #include "obj_file.h"
 

sr_unix/auto_zlink.c

@@ -14,10 +14,10 @@
 #include "gtm_string.h"
 
 #include "urx.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "op.h"
-#include "auto_zlink.h"
+#include <auto_zlink.h>
 
 GBLREF unsigned char    *obpt;          /* output buffer index */
 GBLREF stack_frame	*frame_pointer;

sr_unix/bin_load.c

@@ -41,7 +41,7 @@
 #ifdef GTM_CRYPT
 #include "gtmcrypt.h"
 #endif
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "gvcst_protos.h"	/* for gvcst_root_search in GV_BIND_NAME_AND_ROOT_SEARCH macro */
 

sr_unix/ci_ret_code.c

@@ -10,7 +10,7 @@
  ****************************************************************/
 
 #include "mdef.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "error.h"
 #include "gtmci.h"

sr_unix/comp_lits.c

@@ -11,7 +11,7 @@
 
 #include "mdef.h"
 #include "compiler.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "mdq.h"
 #include "stringpool.h"
 

sr_unix/error_return.c

@@ -17,7 +17,7 @@
 #include "error.h"
 #include "error_trap.h"
 #include "dollar_zlevel.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "golevel.h"
 #include "io.h"

sr_unix/exttab_parse.c

@@ -22,7 +22,7 @@
 #include "gtm_stat.h"
 #include "copy.h"
 #include "gtmxc_types.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "lv_val.h"	/* needed for "fgncal.h" */
 #include "fgncal.h"
 #include "gtmci.h"

sr_unix/fgn_getinfo.c

@@ -14,7 +14,7 @@
 #include "gtm_string.h"
 #include <dlfcn.h>
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "real_len.h"	/* for COPY_DLERR_MSG */
 #include "lv_val.h"	/* needed for "fgncal.h" */
 #include "fgncal.h"

sr_unix/fgncalsp.h

@@ -141,7 +141,7 @@ typedef struct parmblk_struct
 	lv_val	*args[MAX_ACTUALS];
 } parmblk_struct;
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 
 /* function prototypes */
 void_ptr_t	fgn_getpak(char *pak_name, int msgtype);

sr_unix/get_src_line.c

@@ -19,7 +19,7 @@
 #include "gtm_stat.h"
 #include "gtm_stdio.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "zroutines.h"
 #include "compiler.h"
 #include "srcline.h"

sr_unix/go_load.c

@@ -35,7 +35,7 @@
 #include "str2gvkey.h"
 #include "gtmmsg.h"
 #include "gtm_utf8.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 
 GBLREF bool	mupip_error_occurred;

sr_unix/golevel.c

@@ -13,7 +13,7 @@
 
 #include "gtm_stdio.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "tp_frame.h"
 #include "golevel.h"

sr_unix/gtm_compile.c

@@ -18,7 +18,7 @@
 #include "cmd_qlf.h"
 #include "iosp.h"
 #include "cli.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mv_stent.h"
 #include "lv_val.h"

sr_unix/gtm_event_log.c

@@ -16,7 +16,7 @@
 #include "gtm_stdio.h"
 
 #include "gtm_event_log.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "lv_val.h"	/* needed for "fgncal.h" */
 #include "fgncal.h"
 #include "io.h"

sr_unix/gtm_init_env.c

@@ -10,7 +10,7 @@
  ****************************************************************/
 
 #include "mdef.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "startup.h"
 #include "gtm_startup.h"

sr_unix/gtm_main.c

@@ -15,7 +15,7 @@
 #include "gtm_string.h"
 
 #include "startup.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "error.h"
 #include "cli.h"

sr_unix/gtm_startup.c

@@ -19,7 +19,7 @@
 
 #include "error.h"
 #include "fnpc.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "stringpool.h"
 #include "stp_parms.h"

sr_unix/gtm_text_alloc.c

@@ -106,7 +106,7 @@ static  uint4  		TwoTable[MAXINDEX + 2];
 /* ******* z/OS expansion ******* */
 #undef malloc
 #undef free
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "obj_file.h"
 
 /* This function is meant as a temporary replacement for the gtm_text_alloc code that uses mmap.

sr_unix/gtm_trigger.c

@@ -21,7 +21,7 @@
 
 #include "compiler.h"
 #include "error.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "lv_val.h"
 #include "mv_stent.h"
@@ -51,7 +51,7 @@
 #include "tp_frame.h"
 #include "gvname_info.h"
 #include "op_merge.h"
-#include "auto_zlink.h"
+#include <auto_zlink.h>
 #include "golevel.h"
 #include "flush_jmp.h"
 #include "dollar_zlevel.h"

sr_unix/gtm_unlink_all.c

@@ -18,7 +18,7 @@
 #include "hashtab.h"
 #include "hashtab_objcode.h"
 #include "hashtab_mname.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mprof.h"
 #include "gtm_unlink_all.h"

sr_unix/gtmci.c

@@ -17,7 +17,7 @@
 #include "gtm_string.h"
 #include "cli.h"
 #include "stringpool.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mvalconv.h"
 #include "gtmxc_types.h"

sr_unix/gtmci_ch.c

@@ -10,7 +10,7 @@
  ****************************************************************/
 
 #include "mdef.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mv_stent.h"
 #include "error.h"

sr_unix/gtmci_isv.c

@@ -12,7 +12,7 @@
 #include "mdef.h"
 #include "gtm_string.h"
 #include "op.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "gtmci.h"
 #include "svnames.h"

sr_unix/gtmcrypt.h

@@ -13,7 +13,7 @@
 #define GTMCRYPT_H
 
 #include <signal.h>
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "gtmxc_types.h"
 #include "gtmcrypt_interface.h"

sr_unix/gtmsource_onln_rlbk_clnup.c

@@ -20,7 +20,7 @@
 #include "gdscc.h"
 #include "filestruct.h"
 #include "jnl.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "buddy_list.h"		/* needed for tp.h */
 #include "tp.h"

sr_unix/gv_trigger.c

@@ -18,7 +18,7 @@
 #include "gtm_facility.h"
 #include "fileinfo.h"
 #include "gdsfhead.h"
-#include "rtnhdr.h"		/* for rtn_tabent in gv_trigger.h */
+#include <rtnhdr.h>		/* for rtn_tabent in gv_trigger.h */
 #include "gv_trigger.h"
 #include "gtm_trigger.h"
 #include "error.h"

sr_unix/incr_link.c

@@ -16,7 +16,7 @@
 #include "gtm_unistd.h"
 #include "gtm_stdio.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "compiler.h"
 #include "urx.h"
 #include "objlabel.h"

sr_unix/init_gtm.c

@@ -14,7 +14,7 @@
 #include "gtm_stdlib.h"
 #include "gtm_string.h"
 #include "startup.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "error.h"
 #include "cli.h"

sr_unix/jobchild_init.c

@@ -17,7 +17,7 @@
 
 #include <errno.h>
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "startup.h"
 #include "gtm_startup.h"
 #include "stack_frame.h"

sr_unix/lref_parse.c

@@ -14,7 +14,7 @@
 #include "gtm_string.h"
 #include "gtm_stdlib.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "startup.h"
 #include "gtm_startup.h"
 

sr_unix/make_cimode.c

@@ -11,7 +11,7 @@
 
 #include "mdef.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gtmci.h"
 #include "make_mode.h"
 

sr_unix/make_dmode.c

@@ -11,7 +11,7 @@
 
 #include "mdef.h"
 
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "make_mode.h"
 
 rhdtyp *make_dmode (void)

sr_unix/make_mode.c

@@ -15,7 +15,7 @@
 
 #include "error.h"
 #include "dm_setup.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "op.h"
 #include "compiler.h"
 #include "emit_code.h"

sr_unix/map_sym.c

@@ -14,7 +14,7 @@
 #include "gtm_stdlib.h"
 
 #include "collseq.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "lv_val.h"		/* needed for "fgncal.h" */
 #include "fgncal.h"
 #include "iosp.h"

sr_unix/mu_trig_trgfile.c

@@ -14,7 +14,7 @@
 #include "gdsroot.h"
 #include "gtm_string.h"
 #include "cli.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "mu_gv_stack_init.h"
 #include "trigger_trgfile_protos.h"
 #include "mu_trig_trgfile.h"

sr_unix/mupip_trigger.c

@@ -21,7 +21,7 @@
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdsfhead.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "mupip_trigger.h"
 #include "mu_trig_trgfile.h"

sr_unix/obj_code.c

@@ -21,7 +21,7 @@
 
 #include "compiler.h"
 #include "obj_gen.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "cmd_qlf.h"
 #include "cgp.h"
 #include "gtmio.h"

sr_unix/obj_file.c

@@ -17,7 +17,7 @@
 #include <errno.h>
 
 #include "compiler.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "obj_gen.h"
 #include "cgp.h"
 #include "mdq.h"

sr_unix/ojstartchild.c

@@ -32,7 +32,7 @@
 
 #include "job.h"
 #include "error.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "io.h"
 #include "iosp.h"
 #include "eintr_wrappers.h"

sr_unix/op_fnfgncal.c

@@ -18,7 +18,7 @@
 
 #include "stringpool.h"
 #include "copy.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "op.h"
 #include "lv_val.h"		/* needed for "fgncal.h" */

sr_unix/op_ztrigger.c

@@ -35,7 +35,7 @@
 #include "repl_msg.h"
 #include "gtmsource.h"
 #include "interlock.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #ifdef GTM_TRIGGER
 #  include "gv_trigger.h"

sr_unix/set_zstatus.c

@@ -19,7 +19,7 @@
 #include "stringpool.h"
 #include "mlkdef.h"
 #include "zshow.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mvalconv.h"
 #include "error_trap.h"

sr_unix/trigger_compare.c

@@ -21,7 +21,7 @@
 #include "mv_stent.h"			/* for COPY_SUBS_TO_GVCURRKEY macro */
 #include "gvsub2str.h"			/* for COPY_SUBS_TO_GVCURRKEY */
 #include "format_targ_key.h"		/* for COPY_SUBS_TO_GVCURRKEY */
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "trigger.h"
 #include "trigger_compare_protos.h"

sr_unix/trigger_delete.c

@@ -16,7 +16,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"			/* For gvcst_protos.h */
 #include "gvcst_protos.h"
-#include "rtnhdr.h"			/* for gv_trigger.h */
+#include <rtnhdr.h>			/* for gv_trigger.h */
 #include "gv_trigger.h"
 #include "gdscc.h"			/* needed for tp.h */
 #include "gdskill.h"			/* needed for tp.h */

sr_unix/trigger_fill_xecute_buffer.c

@@ -17,7 +17,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"
 #include "gvcst_protos.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "trigger.h"
 #include "mv_stent.h"			/* for COPY_SUBS_TO_GVCURRKEY macro */

sr_unix/trigger_gbl_fill_xecute_buffer.c

@@ -16,7 +16,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"
 #include "gvcst_protos.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "mv_stent.h"			/* for COPY_SUBS_TO_GVCURRKEY macro (within BUILD_HASHT_...) */
 #include "gvsub2str.h"			/* for COPY_SUBS_TO_GVCURRKEY */

sr_unix/trigger_incr_cycle.c

@@ -15,7 +15,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"			/* For gvcst_protos.h */
 #include "gvcst_protos.h"
-#include "rtnhdr.h"			/* for gv_trigger.h */
+#include <rtnhdr.h>			/* for gv_trigger.h */
 #include "gv_trigger.h"
 #include "trigger.h"
 #include "trigger_incr_cycle.h"

sr_unix/trigger_parse.c

@@ -17,7 +17,7 @@
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdsfhead.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "gtm_trigger.h"
 #include "trigger.h"

sr_unix/trigger_read_name_entry.c

@@ -17,7 +17,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"
 #include "gvcst_protos.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "trigger.h"
 #include "trigger_read_name_entry.h"

sr_unix/trigger_select.c

@@ -20,7 +20,7 @@
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdsfhead.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "targ_alloc.h"
 #include "filestruct.h"

sr_unix/trigger_source_read_andor_verify.c

@@ -17,7 +17,7 @@
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"
 #include "gvcst_protos.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "gtm_trigger.h"
 #include "trigger.h"

sr_unix/trigger_trgfile.c

@@ -18,7 +18,7 @@
 #include "gdsroot.h"			/* for gdsfhead.h */
 #include "gdsbt.h"			/* for gdsfhead.h */
 #include "gdsfhead.h"			/* For gvcst_protos.h */
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gv_trigger.h"
 #include "io.h"
 #include "hashtab_str.h"

sr_unix/trigger_update.c

@@ -17,7 +17,7 @@
 #include "gdsfhead.h"			/* For gvcst_protos.h */
 #include "dpgbldir.h"
 #include "gvcst_protos.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "io.h"
 #include "iormdef.h"
 #include "hashtab_str.h"

sr_unix/trigger_user_name.c

@@ -13,7 +13,7 @@
 
 #include "gtm_ctype.h"
 #include "gtm_string.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"

sr_unix/urx_remove.c

@@ -12,7 +12,7 @@
 #include "mdef.h"
 
 #include "gtm_stdio.h"
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 #include "urx.h"
 
 /* Routine to run the unresolved chain in search of entries that point into the linkage section that

sr_unix/zlmov_lnames.c

@@ -11,7 +11,7 @@
 
 #include "mdef.h"
 #include <string.h>
-#include "rtnhdr.h"
+#include <rtnhdr.h>
 
 #ifdef USHBIN_SUPPORTED
 void zlmov_lnames(rhdtyp *hdr)