From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 11 Sep 2010 11:51:52 +0000 (+0100)
Subject: rx: Call rxgen_consts.h by its proper name
X-Git-Tag: upstream/1.8.0_pre1^2~4807
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=34df5da39871ae5231048a416f191784c5c2d127;p=packages%2Fo%2Fopenafs.git

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.

Change-Id: Ia3faf4c08bd69cb64652b8c1ab722c49179667c8
Reviewed-on: http://gerrit.openafs.org/2750
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

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 dbf9f0ab3..a3fb69a7c 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -78,7 +78,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 7ae089330..903015c29 100644
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -389,7 +389,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");
 	}
@@ -509,7 +509,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) {
@@ -669,7 +669,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) {
@@ -734,7 +734,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) {