From: Simon Wilkinson Date: Sat, 21 Aug 2010 11:05:37 +0000 (+0100) Subject: Don't include afsconfig.h in rxgen headers X-Git-Tag: openafs-devel-1_5_77~40 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f820ab766e173ef708e6e5f1efb56bfb4dfd9ff3;p=packages%2Fo%2Fopenafs.git Don't include afsconfig.h in rxgen headers Some headers generated by rxgen are installed. We can't use afsconfig.h in installed headers, as it isn't installed (and it shouldn't be, as it contains autoconf defines which will almost certainly have namespace conflicts with other packages) Revert the portion of 972a407 that added afsconfig.h to the h_output function. This should now be safe as stds.h no longer relies on the result of autoconf tests. FIXES 127931 Change-Id: I75645620e46c4f354ca984a8daf99254650133f6 Reviewed-on: http://gerrit.openafs.org/2604 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 975b662d8ecabeb82ffd2a3a2dce0c8d6e6cc473) Reviewed-on: http://gerrit.openafs.org/2673 --- diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c index c16f36db6..7ae089330 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -516,7 +516,6 @@ h_output(char *infile, char *define, int extend, char *outfile, int append) f_print(fout, "#include \"rx/rx_globals.h\"\n"); } f_print(fout, "#else /* KERNEL */\n"); - f_print(fout, "#include \n"); f_print(fout, "#include \n"); f_print(fout, "#include \n"); f_print(fout, "#include \n");