rxgen: skip ubik for KERNEL

Declare ubik rxgen stubs only for !KERNEL, UKERNEL doesn't need them anymore.
Don't declare ubik_client or #include ubik.h on KERNEL or UKERNEL.

Change-Id: I0b1587eb46e9efbf627f04c74e0d76f9858bffd0
Reviewed-on: http://gerrit.openafs.org/9954
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c
index 386db3b03651cca39da5b027fe3ec446a8fcae9c..e4e15ac059392533f16a3eb0b20b48bb212f926c 100644 (file)
--- a/src/rxgen/rpc_hout.c
+++ b/src/rxgen/rpc_hout.c
@@ -273,8 +273,11 @@ psprocdef(definition * defp)
     if (!(!multi_flag && split_flag))
         psproc1(defp, 0, "int", "", 0xFFFFFFFF);
 
-    if (uflag && !kflag)
+    if (uflag && !kflag) {
+       f_print(fout, "\n#ifndef KERNEL");
        psproc1(defp, 2, "int", "ubik_", 0xFFFFFFFF);
+       f_print(fout, "#endif /* KERNEL */\n");
+    }
 
     if (*ServerPrefix)
        psproc1(defp, 3, "afs_int32", ServerPrefix, 0xFFFFFFFF);

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index ec97dc33baf12f850a0ea6ef52555e842411d328..9a517fc3824e2411145ba48738b9292c876f8f06 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -461,14 +461,11 @@ h_output(char *infile, char *define, int extend, char *outfile, int append)
     if (brief_flag) {
        f_print(fout, "#include \"rx/rx_opaque.h\"\n");
     }
-    if (uflag)
-       f_print(fout, "#include <ubik.h>\n");
     f_print(fout, "#else       /* UKERNEL */\n");
     f_print(fout, "#include \"h/types.h\"\n");
     f_print(fout, "#ifndef     SOCK_DGRAM  /* XXXXX */\n");
     f_print(fout, "#include \"h/socket.h\"\n");
     f_print(fout, "#endif\n");
-    f_print(fout, "struct ubik_client;\n");
     f_print(fout, "#ifndef     DTYPE_SOCKET  /* XXXXX */\n");
     f_print(fout, "#ifndef AFS_LINUX22_ENV\n");
     f_print(fout, "#include \"h/file.h\"\n");