From e7f480d54016ef490d8bf13ab1dabfe6b2856550 Mon Sep 17 00:00:00 2001 From: Amul Shah Date: Fri, 15 Jun 2012 13:29:37 -0400 Subject: [PATCH] ENH: Use <> instead of quotation marks for header includes The following header files are present multiple times in the directories list. rtnhdr.h sr_unix sr_unix_nsb zbreaksp.h sr_unix sr_i386 emit_code.h sr_port sr_i386 auto_zlink.h sr_unix sr_i386 obj_filesp.h sr_unix sr_unix_nsb opcode_def.h sr_port sr_unix_nsb This over lap meant that a #include "header.h" chose the header in the same directory as a C file instead of the one listed in the compile line include directory listing. --- sr_i386/auto_zlink.c | 2 +- sr_i386/emit_code.c | 2 +- sr_port/obj_file.h | 2 +- sr_port/oc_tab.c | 2 +- sr_port/oc_tab_graphic.c | 2 +- sr_port/opcode.h | 2 +- sr_unix/make_mode.c | 2 +- sr_unix_nsb/shrink_jmps.c | 2 +- sr_x86_64/emit_code_sp.c | 2 +- sr_x86_64/obj_filesp.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sr_i386/auto_zlink.c b/sr_i386/auto_zlink.c index e96d9d8..cacfcc7 100644 --- a/sr_i386/auto_zlink.c +++ b/sr_i386/auto_zlink.c @@ -17,7 +17,7 @@ #include "urx.h" #include "rtnhdr.h" #include "op.h" -#include "auto_zlink.h" +#include #define PEA_SZ 5 #define XFER_BYTE_SZ 3 diff --git a/sr_i386/emit_code.c b/sr_i386/emit_code.c index 70c1922..657ec3b 100644 --- a/sr_i386/emit_code.c +++ b/sr_i386/emit_code.c @@ -23,7 +23,7 @@ #include "obj_gen.h" #include "i386.h" #include "obj_file.h" -#include "emit_code.h" +#include #include "hashtab_mname.h" #include "stddef.h" diff --git a/sr_port/obj_file.h b/sr_port/obj_file.h index d11b30c..33606c4 100644 --- a/sr_port/obj_file.h +++ b/sr_port/obj_file.h @@ -12,7 +12,7 @@ #ifndef OBJ_FILE_INCLUDED #define OBJ_FILE_INCLUDED -#include "obj_filesp.h" +#include void emit_immed(char *source, uint4 size); void emit_literals(void); diff --git a/sr_port/oc_tab.c b/sr_port/oc_tab.c index 8d01a00..a90ddac 100644 --- a/sr_port/oc_tab.c +++ b/sr_port/oc_tab.c @@ -16,6 +16,6 @@ LITDEF octabstruct oc_tab[] = { #define OPCODE_DEF(A,B) {B}, -#include "opcode_def.h" +#include }; #undef OPCODE_DEF diff --git a/sr_port/oc_tab_graphic.c b/sr_port/oc_tab_graphic.c index 3d0997d..31df79c 100644 --- a/sr_port/oc_tab_graphic.c +++ b/sr_port/oc_tab_graphic.c @@ -16,6 +16,6 @@ LITDEF char *oc_tab_graphic[] = { #define OPCODE_DEF(A,B) #A, -#include "opcode_def.h" +#include }; #undef OPCODE_DEF diff --git a/sr_port/opcode.h b/sr_port/opcode.h index df6b21a..736b7e5 100644 --- a/sr_port/opcode.h +++ b/sr_port/opcode.h @@ -13,7 +13,7 @@ enum opcode_enum { -#include "opcode_def.h" +#include OPCODE_COUNT }; diff --git a/sr_unix/make_mode.c b/sr_unix/make_mode.c index 86a29aa..9166f06 100644 --- a/sr_unix/make_mode.c +++ b/sr_unix/make_mode.c @@ -18,7 +18,7 @@ #include #include "op.h" #include "compiler.h" -#include "emit_code.h" +#include #include "gtmci.h" #include "inst_flush.h" #include "obj_file.h" diff --git a/sr_unix_nsb/shrink_jmps.c b/sr_unix_nsb/shrink_jmps.c index 0435bb1..9b3a329 100644 --- a/sr_unix_nsb/shrink_jmps.c +++ b/sr_unix_nsb/shrink_jmps.c @@ -14,7 +14,7 @@ #include "opcode.h" #include "mdq.h" #include "cgp.h" -#include "emit_code.h" +#include #include "rtnhdr.h" #include "obj_file.h" diff --git a/sr_x86_64/emit_code_sp.c b/sr_x86_64/emit_code_sp.c index 00b1b70..2f5665a 100644 --- a/sr_x86_64/emit_code_sp.c +++ b/sr_x86_64/emit_code_sp.c @@ -24,7 +24,7 @@ #include "vxt.h" #include "cgp.h" #include "compiler.h" -#include "emit_code.h" +#include GBLDEF struct emit_base_info emit_base_info; diff --git a/sr_x86_64/obj_filesp.c b/sr_x86_64/obj_filesp.c index 3bb001d..eeac597 100644 --- a/sr_x86_64/obj_filesp.c +++ b/sr_x86_64/obj_filesp.c @@ -49,7 +49,7 @@ #include "gtmio.h" #include "mmemory.h" #include "obj_file.h" -#include "obj_filesp.h" +#include #include "release_name.h" #include "min_max.h" /* The following definitions are reqquired for the new(for ELF files) create/close_obj_file.c functions */