From 59797ad4fedbf5499141bc01a3f1829730bffea2 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sat, 11 Sep 2010 12:51:52 +0100 Subject: [PATCH] rx: Call rxgen_consts.h by its proper name rxgen_consts.h is actually in the afs/ directory. Include it from their, rather than requiring that every user have $(TOP_INCDIR)/afs in their search path. Reviewed-on: http://gerrit.openafs.org/2750 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 34df5da39871ae5231048a416f191784c5c2d127) Change-Id: I915cf9d975efbb7c73c1e57750227421362648c8 Reviewed-on: http://gerrit.openafs.org/6263 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/config/icl.h | 2 +- src/rx/rx.c | 2 +- src/rxgen/rpc_main.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/icl.h b/src/config/icl.h index c8b9208b4..35ae59ac3 100644 --- a/src/config/icl.h +++ b/src/config/icl.h @@ -14,7 +14,7 @@ #define _ICL_H__ENV_ 1 #ifdef KERNEL -#include "param.h" +#include "afs/param.h" #include "afs_osi.h" #include "lock.h" #include "afs_trace.h" diff --git a/src/rx/rx.c b/src/rx/rx.c index 4245b1849..5d65528e5 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -81,7 +81,7 @@ extern afs_int32 afs_termState; #include "sys/lockl.h" #include "sys/lock_def.h" #endif /* AFS_AIX41_ENV */ -# include "rxgen_consts.h" +# include "afs/rxgen_consts.h" #else /* KERNEL */ # include # include diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index 88cebbdae..20a147e77 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -391,7 +391,7 @@ c_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"netinet/in.h\"\n"); f_print(fout, "#include \"h/time.h\"\n"); f_print(fout, "#include \"rx/xdr.h\"\n"); - f_print(fout, "#include \"rxgen_consts.h\"\n"); + f_print(fout, "#include \"afs/rxgen_consts.h\"\n"); } else { f_print(fout, "#include \n"); } @@ -514,7 +514,7 @@ h_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"rx/xdr.h\"\n"); f_print(fout, "#endif /* XDR_GETLONG */\n"); f_print(fout, "#endif /* UKERNEL */\n"); - f_print(fout, "#include \"rxgen_consts.h\"\n"); + f_print(fout, "#include \"afs/rxgen_consts.h\"\n"); f_print(fout, "#include \"afs_osi.h\"\n"); f_print(fout, "#include \"rx/rx.h\"\n"); if (xflag) { @@ -680,7 +680,7 @@ C_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"h/time.h\"\n"); f_print(fout, "#include \"rpc/types.h\"\n"); f_print(fout, "#include \"rx/xdr.h\"\n"); - f_print(fout, "#include \"rxgen_consts.h\"\n"); + f_print(fout, "#include \"afs/rxgen_consts.h\"\n"); f_print(fout, "#include \"afs/afs_osi.h\"\n"); f_print(fout, "#include \"rx/rx.h\"\n"); if (xflag) { @@ -751,7 +751,7 @@ S_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"h/time.h\"\n"); f_print(fout, "#include \"rpc/types.h\"\n"); f_print(fout, "#include \"rx/xdr.h\"\n"); - f_print(fout, "#include \"rxgen_consts.h\"\n"); + f_print(fout, "#include \"afs/rxgen_consts.h\"\n"); f_print(fout, "#include \"afs/afs_osi.h\"\n"); f_print(fout, "#include \"rx/rx.h\"\n"); if (xflag) { -- 2.39.5