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 <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 34df5da39871ae5231048a416f191784c5c2d127)

Change-Id: I915cf9d975efbb7c73c1e57750227421362648c8
Reviewed-on: http://gerrit.openafs.org/6263
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/config/icl.h b/src/config/icl.h
index c8b9208b42934bb775a5dd5439d38c194cb46eb8..35ae59ac3459091ad13697a78e52430f07c6427b 100644 (file)
--- 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 4245b18494e07ccff0d3b3bb520190e04929938b..5d65528e526524fa3eac93b0f05f362ef3364809 100644 (file)
--- 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 <sys/types.h>
 # include <string.h>

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 88cebbdaeee36ff4989769782e7f9b3de0cfcbcf..20a147e7741d43f754b7dd8ffbfb524e4072a359 100644 (file)
--- 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 <rx/xdr.h>\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) {