Include shlib-compat.h in many sunrpc/nis source files.

Every file that uses libc_hidden_nolink_sunrpc or
libnsl_hidden_nolink_def needs to include shlib-compat.h.  Currently,
most of them are getting it via stdio.h, because libio.h refers to
SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h.  My
experimental patch to not install libio.h breaks that chain; stdio.h
no longer pulls in libio.h even for internal users.

Accordingly, this patch adds #include <shlib-compat.h> to many files
in sunrpc/ and nis/.  There are also a small number of really obvious
fixups to includes that caught my eye while proofreading the patch -
not including headers twice in a row, not worrying about portability
to Ultrix anymore, sort of thing.

	* nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c
	* nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c
	* nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c
	* nis/nis_destroygroup.c, nis/nis_domain_of.c
	* nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c
	* nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c
	* nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c
	* nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c
	* nis/nis_print_group_entry.c, nis/nis_remove.c
	* nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c
	* nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c
	* nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c
	* nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c
	* sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c
	* sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c
	* sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c
	* sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c
	* sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c
	* sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c
	* sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c
	* sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c
	* sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c
	* sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c
	* sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c
	* sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c
	* sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c
	* sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c
	* sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c
	* sunrpc/xdr_stdio.c: Include shlib-compat.h.

	* sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include
	abi-versions.h as well as shlib-compat.h.
	* sunrpc/get_myaddr.c: Remove obsolete comment.
	* sunrpc/pmap_rmt.c: Remove obsolete comment and #undef.
	* sunrpc/rpc_thread.c: Include libc-lock.h only once.
	* resolv/res_libc.c: Include shlib-compat.h only once.

diff --git a/nis/nis_add.c b/nis/nis_add.c
index 3ec49c018a2fcc065a70944350feaea69bfc8103..a440252292874648936ce6563b9dc953e6ed5d53 100644 (file)
--- a/nis/nis_add.c
+++ b/nis/nis_add.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_addmember.c b/nis/nis_addmember.c
index 6b0c29530f881dc922566b90b1eb5974f202ffb0..d2c47ab18fc34c749454cb81293efdbc8a62cfd1 100644 (file)
--- a/nis/nis_addmember.c
+++ b/nis/nis_addmember.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_addmember (const_nis_name member, const_nis_name group)

diff --git a/nis/nis_call.c b/nis/nis_call.c
index 03b15de2bc8a5fd2c74f7ee9ea81ac29f5d8ac37..d4f37bfb72e5284c6521f0a4789fff2d42bc92c9 100644 (file)
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -33,6 +33,7 @@
 #include "nis_xdr.h"
 #include "nis_intern.h"
 #include <libnsl.h>
+#include <shlib-compat.h>
 
 static const struct timeval RPCTIMEOUT = {10, 0};
 static const struct timeval UDPTIMEOUT = {5, 0};

diff --git a/nis/nis_checkpoint.c b/nis/nis_checkpoint.c
index 06656a476e49c3327326cb752034967f25fdfaad..f148af4170d1c3549c2910f9b52ba347a3ecbcc6 100644 (file)
--- a/nis/nis_checkpoint.c
+++ b/nis/nis_checkpoint.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_clone_dir.c b/nis/nis_clone_dir.c
index 41e2f772100b68c6c9c748292c0b6025562b325f..982f475218b777289dc10c4b33295c1ef1666834 100644 (file)
--- a/nis/nis_clone_dir.c
+++ b/nis/nis_clone_dir.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 

diff --git a/nis/nis_clone_obj.c b/nis/nis_clone_obj.c
index 7299e11f6ea3e78cf6e267123cd7995ded350490..1d7e2e3ca5d36e62caaea18413a0f8bf23ec3e58 100644 (file)
--- a/nis/nis_clone_obj.c
+++ b/nis/nis_clone_obj.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 

diff --git a/nis/nis_clone_res.c b/nis/nis_clone_res.c
index ca998346f8805256a9ea070d68b1c60ced041cb0..db7716538aa65b7061a2da6658ab94ce7c63e755 100644 (file)
--- a/nis/nis_clone_res.c
+++ b/nis/nis_clone_res.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 

diff --git a/nis/nis_creategroup.c b/nis/nis_creategroup.c
index 6d5a08dc8183044951922b30bc25288182603a43..1d7e058710f44e5b8558b2135b4b7133e1027a29 100644 (file)
--- a/nis/nis_creategroup.c
+++ b/nis/nis_creategroup.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_creategroup (const_nis_name group, unsigned int flags)

diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 7e6054d35d7f78edf488e418ac8dd4b80b35ca0e..1188a81b304ea0c6bd9eb76ec8f9a47b95ef4587 100644 (file)
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #define DEFAULT_TTL 43200
 

diff --git a/nis/nis_destroygroup.c b/nis/nis_destroygroup.c
index 662d6586936bc82e983710982ee3e1ffe72b3a2c..fbcd5efddf31581dbf20131f37ec34716432d3a4 100644 (file)
--- a/nis/nis_destroygroup.c
+++ b/nis/nis_destroygroup.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_destroygroup (const_nis_name group)

diff --git a/nis/nis_domain_of.c b/nis/nis_domain_of.c
index 6e2025cbdc5db11b14a7e2dca30c62d32e13502a..68d958f75e6778655a17544cc782f7ced4c96b42 100644 (file)
--- a/nis/nis_domain_of.c
+++ b/nis/nis_domain_of.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_domain_of (const_nis_name name)

diff --git a/nis/nis_domain_of_r.c b/nis/nis_domain_of_r.c
index 57f99a2cedf73ef9928df66e1f85f748e0534b07..9711eca605f18be109cad62f5e2e03be14ada575 100644 (file)
--- a/nis/nis_domain_of_r.c
+++ b/nis/nis_domain_of_r.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen)

diff --git a/nis/nis_error.c b/nis/nis_error.c
index e55d784dfb3bf6b0e1e647d71ae9650bf44d8084..32b2a100f602ad6ac575c4243a958e4ceea3082f 100644 (file)
--- a/nis/nis_error.c
+++ b/nis/nis_error.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 
 #define MF(line) MF1 (line)

diff --git a/nis/nis_file.c b/nis/nis_file.c
index c3c6c57f229159b4c9beab7c875d1337a951df5c..d6c1d14aaefd51e57c1fdb0fecae38e8a212f049 100644 (file)
--- a/nis/nis_file.c
+++ b/nis/nis_file.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 #include "nis_xdr.h"
 
 typedef bool_t (*iofct_t) (XDR *, void *);

diff --git a/nis/nis_free.c b/nis/nis_free.c
index 2b1580e9d5be1c4353c110ec3af35fc7b04c467f..1d3298f2a9d037842154ebd552f65840458eeba9 100644 (file)
--- a/nis/nis_free.c
+++ b/nis/nis_free.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 #include "nis_xdr.h"
 
 void

diff --git a/nis/nis_getservlist.c b/nis/nis_getservlist.c
index 1f9482c7dadee988865e57c1877a64e1604ff939..fba18c77ca1639f360934ac1132e48f6c0787782 100644 (file)
--- a/nis/nis_getservlist.c
+++ b/nis/nis_getservlist.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_ismember.c b/nis/nis_ismember.c
index 0006d6f80a9fd73f580617506bb5e406947ce7fd..5aba3367f58692274140d96e805b1bdc6655c203 100644 (file)
--- a/nis/nis_ismember.c
+++ b/nis/nis_ismember.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 /* internal_nis_ismember ()
    return codes: -1 principal is in -group

diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c
index 090125d7de608fbc36951e7eaeecd2986eface04..99d8f99e27cf019c6a0aacfd8df87af0e27ca860 100644 (file)
--- a/nis/nis_local_names.c
+++ b/nis/nis_local_names.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_local_group (void)

diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c
index 2b953cff90f5f3021c1a31917338feca7f19172e..f6d84abecd5bef0548e56c33543fc68edbfbf12e 100644 (file)
--- a/nis/nis_lookup.c
+++ b/nis/nis_lookup.c
@@ -21,6 +21,7 @@
 #include "nis_xdr.h"
 #include "nis_intern.h"
 #include <libnsl.h>
+#include <shlib-compat.h>
 
 
 nis_result *

diff --git a/nis/nis_mkdir.c b/nis/nis_mkdir.c
index bea7d18d0f954ccc57835ae8015e1eefa866dcaa..da6690cdcbe27b05a2cbaeb87925ca44deb06031 100644 (file)
--- a/nis/nis_mkdir.c
+++ b/nis/nis_mkdir.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_modify.c b/nis/nis_modify.c
index 18d1bd1114cb9bc9bd147029c472c7bcb09a579a..67315165bc938aa79a1a0b4d548b788d17fb8091 100644 (file)
--- a/nis/nis_modify.c
+++ b/nis/nis_modify.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_ping.c b/nis/nis_ping.c
index 1924336352063f7cb3da72e772b65a09da75a4b1..b744898ba2f50dc8903633e0527b61ef3d5f74d7 100644 (file)
--- a/nis/nis_ping.c
+++ b/nis/nis_ping.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_print.c b/nis/nis_print.c
index 0ee49020a0b763413170a1302ce844681e6fb7ec..869f6aad6186c55513eb29f04fd04b6081059b1b 100644 (file)
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 static const char *
 nis_nstype2str (const nstype type)

diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c
index 1f2766ee2041a37daade2771d289a30010c2a243..3a717e71d7c0d277444c341e7dd207cba1ce29c9 100644 (file)
--- a/nis/nis_print_group_entry.c
+++ b/nis/nis_print_group_entry.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 void
 nis_print_group_entry (const_nis_name group)

diff --git a/nis/nis_remove.c b/nis/nis_remove.c
index 4cfc5c533a331d39620f8117fe4b15055f95ddcc..87c539793dd8709cdc3fe0dac10ac3ffaa676737 100644 (file)
--- a/nis/nis_remove.c
+++ b/nis/nis_remove.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_removemember.c b/nis/nis_removemember.c
index 04a05ca162ac32e655b24c0c953f5b0ac7192e51..af9e2a899cad6a423871a5dfefa885bb6a319597 100644 (file)
--- a/nis/nis_removemember.c
+++ b/nis/nis_removemember.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_removemember (const_nis_name member, const_nis_name group)

diff --git a/nis/nis_rmdir.c b/nis/nis_rmdir.c
index a0c738024fffb5f2855639f25bd1e3267ed9758e..53a0509e05ea5e5f6fa0cdce9c58bb8abe5ccf77 100644 (file)
--- a/nis/nis_rmdir.c
+++ b/nis/nis_rmdir.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_server.c b/nis/nis_server.c
index 2fb16ba195b160dc4662076a080861551f947886..63857721f292ce684b472777cb8cae589b539584 100644 (file)
--- a/nis/nis_server.c
+++ b/nis/nis_server.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_subr.c b/nis/nis_subr.c
index 5c31af8840084de99a68f9d962c8e18334b0e44a..5d93e77330082bce96c947476f8d801d6ab0d39a 100644 (file)
--- a/nis/nis_subr.c
+++ b/nis/nis_subr.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_leaf_of (const_nis_name name)

diff --git a/nis/nis_table.c b/nis/nis_table.c
index bec41f0e884b02d58af7e7a484c8b671ff62fb76..88eb6797e697d66536f1ed06a9948930b74de1cb 100644 (file)
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <rpcsvc/nis.h>
 #include <libc-diag.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_util.c b/nis/nis_util.c
index 681280e8037b5adf187b0b4a88e00ab761dced17..fcb7120e41c71b843dc397060f975526bc95593a 100644 (file)
--- a/nis/nis_util.c
+++ b/nis/nis_util.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"

diff --git a/nis/nis_verifygroup.c b/nis/nis_verifygroup.c
index 294595931f76051a3fd8a8ef715dd742576ac3a5..4fb2cc59778fa6073ea2cdf4d337cdebc9f5014f 100644 (file)
--- a/nis/nis_verifygroup.c
+++ b/nis/nis_verifygroup.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_verifygroup (const_nis_name group)

diff --git a/nis/nis_xdr.c b/nis/nis_xdr.c
index a7b3f8c1196020a2f00b0e57f4e6385258e33f80..3217dc51bddea67a183df7b8b51668075e777d2b 100644 (file)
--- a/nis/nis_xdr.c
+++ b/nis/nis_xdr.c
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <rpcsvc/nis.h>
 #include <rpcsvc/nis_callback.h> /* for "official" Solaris xdr functions */
+#include <shlib-compat.h>
 
 /* This functions do exist without beginning "_" under Solaris 2.x, but
    we have no prototypes for them. To avoid the same problems as with the

diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
index 3d8b0bf3a6bc74a2b876af4efb1f9840618b79ea..0081b4c926956447987211fc6c1e83a0db63bd51 100644 (file)
--- a/nis/yp_xdr.c
+++ b/nis/yp_xdr.c
@@ -31,6 +31,7 @@
 
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
+#include <shlib-compat.h>
 
 /* The NIS v2 protocol suggests 1024 bytes as a maximum length of all fields.
    Current Linux systems don't use this limit. To remain compatible with

diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 3c4af2e0cffa274d9a0ba2de6d029e2bb02ddbd6..a03e347685cc5ec6236ebbb8bfe76f5aeb0d8df2 100644 (file)
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -29,6 +29,7 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <libc-lock.h>
+#include <shlib-compat.h>
 
 /* This should only be defined on systems with a BSD compatible ypbind */
 #ifndef BINDINGDIR

diff --git a/nis/ypupdate_xdr.c b/nis/ypupdate_xdr.c
index 61d8880cab7ddcd22046cb86ad700cc86124465c..bbfb2fb683172a4bab12878318e049b6d5381e70 100644 (file)
--- a/nis/ypupdate_xdr.c
+++ b/nis/ypupdate_xdr.c
@@ -30,6 +30,7 @@
  */
 
 #include <rpcsvc/ypupd.h>
+#include <shlib-compat.h>
 
 bool_t
 xdr_yp_buf (XDR *xdrs, yp_buf *objp)

diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index c52574f895d4f19ddd3720fdde0d8246622f2ca5..c8f158d94c277d51833dedd6ef69f143567b03b4 100644 (file)
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -127,15 +127,14 @@ __thread struct __res_state *__resp = &_res;
 extern __thread struct __res_state *__libc_resp
   __attribute__ ((alias ("__resp"))) attribute_hidden;
 
+#include <shlib-compat.h>
+
 /* We declare this with compat_symbol so that it's not
    visible at link time.  Programs must use the accessor functions.  */
 #ifdef SHARED
-# include <shlib-compat.h>
 compat_symbol (libc, _res, _res, GLIBC_2_0);
 #endif
 
-#include <shlib-compat.h>
-
 #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2)
 # undef res_init
 extern int __res_init_weak (void);

diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
index b299c456d6e743996919484a6740175daa5125a9..42d6b552f42252d381e487820338ffda854fa524 100644 (file)
--- a/sunrpc/auth_des.c
+++ b/sunrpc/auth_des.c
@@ -41,6 +41,7 @@
 #include <rpc/xdr.h>
 #include <netinet/in.h>                /* XXX: just to get htonl() and ntohl() */
 #include <sys/socket.h>
+#include <shlib-compat.h>
 
 #define MILLION                1000000L
 #define RTIME_TIMEOUT 5                /* seconds to wait for sync */

diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
index 3f8d52bafbf5caff1729c9197705e724b5158426..b1effb7a0033059a91c728263d82ed4edc32b4c6 100644 (file)
--- a/sunrpc/auth_none.c
+++ b/sunrpc/auth_none.c
@@ -36,6 +36,7 @@
 
 #include <rpc/rpc.h>
 #include <libc-lock.h>
+#include <shlib-compat.h>
 
 #define MAX_MARSHAL_SIZE 20
 

diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index 68b42d7b1f23f23d02cd261c072a2b8c1f35bb66..b71612cd80fbaa1beabd7f9012d5c5cdacdd9d18 100644 (file)
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -46,6 +46,7 @@
 #include <libintl.h>
 #include <sys/param.h>
 #include <wchar.h>
+#include <shlib-compat.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>

diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
index 164c1223ca06ce45bb771292c0f7d3d28c92a1c8..93b7cfc04b377f3bb578aa731195ce2b1c49c296 100644 (file)
--- a/sunrpc/authdes_prot.c
+++ b/sunrpc/authdes_prot.c
@@ -36,6 +36,7 @@
 #include <rpc/xdr.h>
 #include <rpc/auth.h>
 #include <rpc/auth_des.h>
+#include <shlib-compat.h>
 
 #define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE)
 

diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
index d37faee0c75ac8287c5ea37432d1ba9e14322fbe..14fe9f56c852bd6c54b69f54a60499057016a4d7 100644 (file)
--- a/sunrpc/authuxprot.c
+++ b/sunrpc/authuxprot.c
@@ -37,6 +37,7 @@
 #include <rpc/xdr.h>
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
+#include <shlib-compat.h>
 
 /*
  * XDR for unix authentication parameters.

diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
index 8dffaa9fa6b2e6cb1438c07a15f1831c92d5c810..542f85dd356eda5cb608a14ed3a1257c549ecea1 100644 (file)
--- a/sunrpc/clnt_gen.c
+++ b/sunrpc/clnt_gen.c
@@ -35,6 +35,7 @@
 #include <rpc/rpc.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <shlib-compat.h>
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and

diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
index b4f84c92e846390679a8b82b036828f5869f87e4..f682243eaefc006900f289311ac66e239f7bd0b6 100644 (file)
--- a/sunrpc/clnt_perr.c
+++ b/sunrpc/clnt_perr.c
@@ -36,6 +36,7 @@
 #include <rpc/rpc.h>
 #include <wchar.h>
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
 

diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
index a149bf419b1b1d0981bdad21a63488a6d47bdcdf..d62a11a2cadf3fab4e52dc26906b34a6d97d5801 100644 (file)
--- a/sunrpc/clnt_raw.c
+++ b/sunrpc/clnt_raw.c
@@ -40,6 +40,7 @@
 #include <rpc/svc.h>
 #include <rpc/xdr.h>
 #include <libintl.h>
+#include <shlib-compat.h>
 
 #define MCALL_MSG_SIZE 24
 

diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
index 0ecb64ca7bcfb1b514adcd0c956749e74d9298bb..bdf6322fc410ea0c3e8deab66e4081085f604f48 100644 (file)
--- a/sunrpc/clnt_simp.c
+++ b/sunrpc/clnt_simp.c
@@ -40,6 +40,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <string.h>
+#include <shlib-compat.h>
 
 struct callrpc_private_s
   {

diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
index 9bcd9125eaaaf6eda112947c6929f3ad66b95da1..e311b35a258f7a657272871199785b5263f0e610 100644 (file)
--- a/sunrpc/clnt_tcp.c
+++ b/sunrpc/clnt_tcp.c
@@ -54,6 +54,7 @@
 #include <sys/socket.h>
 #include <rpc/pmap_clnt.h>
 #include <wchar.h>
+#include <shlib-compat.h>
 
 extern u_long _create_xid (void);
 

diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 6ce16eb2988c64b5178d0ce6a1cc28271774e023..df21e28f64513407ca0ccc1bda7f4daf0c37c4d7 100644 (file)
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -56,6 +56,7 @@
 
 #include <kernel-features.h>
 #include <inet/net-internal.h>
+#include <shlib-compat.h>
 
 extern u_long _create_xid (void);
 

diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
index 1b8c17931955900baf74f38b9186fa83cb7b173e..8591be5580a5b74aa643959a5922f01209776c0c 100644 (file)
--- a/sunrpc/clnt_unix.c
+++ b/sunrpc/clnt_unix.c
@@ -55,6 +55,7 @@
 #include <sys/socket.h>
 #include <rpc/pmap_clnt.h>
 #include <wchar.h>
+#include <shlib-compat.h>
 
 extern u_long _create_xid (void);
 

diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
index 22a34b7f3ad437adeee4016d22cc05eec81637e6..a4d8b2936bf1f52def7990db96549b16b5ce9b2e 100644 (file)
--- a/sunrpc/des_crypt.c
+++ b/sunrpc/des_crypt.c
@@ -32,7 +32,7 @@
 
 #include <sys/types.h>
 #include <rpc/des_crypt.h>
-#include <abi-versions.h>
+#include <shlib-compat.h>
 #include "des.h"
 
 extern int _des_crypt (char *, unsigned, struct desparams *);

diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
index cddef5d76b95674be433cf874fc9c7fbad8c33d8..f884f8f21b7dbd86610daee555c2f6920650bde6 100644 (file)
--- a/sunrpc/des_soft.c
+++ b/sunrpc/des_soft.c
@@ -32,7 +32,8 @@ static char sccsid[] = "@(#)des_soft.c        2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/
  */
 
 #include <rpc/des_crypt.h>
-#include <abi-versions.h>
+#include <shlib-compat.h>
+
 /*
  * Table giving odd parity in the low bit for ASCII characters
  */

diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
index 24407b53ec91a0cf68c5eb9bb18bf5788e27981d..df334e4134686fdb6a1482a74481191855334374 100644 (file)
--- a/sunrpc/get_myaddr.c
+++ b/sunrpc/get_myaddr.c
@@ -42,9 +42,9 @@
 #include <net/if.h>
 #include <ifaddrs.h>
 #include <sys/ioctl.h>
-/* Order of following two #includes reversed by roland@gnu */
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <shlib-compat.h>
 
 /*
  * don't use gethostbyname, which would invoke yellow pages

diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index a0d9a2a0d157288a419b044a2d24816266d01417..b871c04648890a4e38edaac98377bd8c9f1a1db4 100644 (file)
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -49,6 +49,7 @@
 #include <sys/socket.h>
 #include <rpc/key_prot.h>
 #include <libc-lock.h>
+#include <shlib-compat.h>
 
 #define KEY_TIMEOUT    5       /* per-try timeout in seconds */
 #define KEY_NRETRY     12      /* number of retries */

diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
index 2899c9a44890df06dd4678fc21391e97ca6e5815..3659bab1d36ec5a631fd9579d3382916962d22bd 100644 (file)
--- a/sunrpc/key_prot.c
+++ b/sunrpc/key_prot.c
@@ -29,6 +29,7 @@
  */
 
 #include <rpc/key_prot.h>
+#include <shlib-compat.h>
 
 bool_t
 xdr_keystatus (XDR * xdrs, keystatus * objp)

diff --git a/sunrpc/netname.c b/sunrpc/netname.c
index c694311372fe9b0a0a71a74db838a56322d13502..9aee3e4042c4e44bf287c66a0c10795a924eac6c 100644 (file)
--- a/sunrpc/netname.c
+++ b/sunrpc/netname.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <rpc/rpc.h>
+#include <shlib-compat.h>
 
 #include "nsswitch.h"
 

diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
index 6f7ad10ef6ff68a01732014e0bd345c245fedcce..88c44f01543e365c4de114f168efeab7feda6b71 100644 (file)
--- a/sunrpc/pm_getmaps.c
+++ b/sunrpc/pm_getmaps.c
@@ -44,6 +44,7 @@
 #include <libintl.h>
 #include <unistd.h>
 #include <not-cancel.h>
+#include <shlib-compat.h>
 
 
 /*

diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
index 000a01fa8116352fa5c2b3445fdfccbdc287b161..54d2e439d20319c3bac948f805ee75f1a6a5afdb 100644 (file)
--- a/sunrpc/pm_getport.c
+++ b/sunrpc/pm_getport.c
@@ -38,6 +38,7 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
+#include <shlib-compat.h>
 
 /*
  * Create a socket that is locally bound to a non-reserve port. For

diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
index 5d7d185766964340fca9d9468e0ac8945eb77c09..69b4907b3a6b185b8ed14fe9bbcea7bf2a77ac7e 100644 (file)
--- a/sunrpc/pmap_clnt.c
+++ b/sunrpc/pmap_clnt.c
@@ -45,6 +45,7 @@
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
+#include <shlib-compat.h>
 
 /*
  * Same as get_myaddress, but we try to use the loopback

diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
index 0919d0917ddb454c976715c4c527303955c4b39b..d8d75a7b47133b53bedc66e0fbb91a9e66207ad8 100644 (file)
--- a/sunrpc/pmap_prot.c
+++ b/sunrpc/pmap_prot.c
@@ -35,6 +35,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
+#include <shlib-compat.h>
 
 
 bool_t

diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
index 01f158d6b80c4044553f4e35bc8575c7819b0195..c414db0298f7e8b6332d966458b27faeb8904f65 100644 (file)
--- a/sunrpc/pmap_prot2.c
+++ b/sunrpc/pmap_prot2.c
@@ -35,6 +35,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <rpc/pmap_prot.h>
+#include <shlib-compat.h>
 
 
 /*

diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
index e54fe1447004c6b12e2af7884d4174661988333c..c036d889efe1a527f78c91876dfcf63238ec1a3a 100644 (file)
--- a/sunrpc/pmap_rmt.c
+++ b/sunrpc/pmap_rmt.c
@@ -44,12 +44,13 @@
 #include <sys/socket.h>
 #include <stdio.h>
 #include <errno.h>
-#undef  _POSIX_SOURCE          /* Ultrix <sys/param.h> needs --roland@gnu */
-#include <sys/param.h>         /* Ultrix needs before net/if --roland@gnu */
+#include <sys/param.h>
 #include <net/if.h>
 #include <ifaddrs.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
+#include <shlib-compat.h>
+
 #define MAX_BROADCAST_SIZE 1400
 
 extern u_long _create_xid (void);

diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
index 5209f7bdf28e033751008818618cadfa7f2cf419..ca6e4303d4c60ecc0fd7dd4c622102e3dd37ca17 100644 (file)
--- a/sunrpc/publickey.c
+++ b/sunrpc/publickey.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <rpc/netdb.h>
 #include <rpc/auth_des.h>
+#include <shlib-compat.h>
 
 #include "nsswitch.h"
 

diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
index 62d95fcc83739618351d4cf1ac505398098713bd..ec8cc6cccaa911aab8fc5cce0e385bebb6091bd1 100644 (file)
--- a/sunrpc/rpc_cmsg.c
+++ b/sunrpc/rpc_cmsg.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <sys/param.h>
 #include <rpc/rpc.h>
+#include <shlib-compat.h>
 
 /*
  * XDR a call message

diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
index 81ddf8f55ae1fe4d37b38fc4350ded9b8afefbde..7fe48e181186af63d4af56f6547c79202f9aa54e 100644 (file)
--- a/sunrpc/rpc_dtable.c
+++ b/sunrpc/rpc_dtable.c
@@ -31,6 +31,7 @@
 
 #include <unistd.h>
 #include <rpc/clnt.h>
+#include <shlib-compat.h>
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an

diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
index f47c6befe423b8b8f463d77e74b421168c6a067e..46582f2a354284630e63b7b9b012331e6045d4f5 100644 (file)
--- a/sunrpc/rpc_prot.c
+++ b/sunrpc/rpc_prot.c
@@ -39,8 +39,8 @@
  */
 
 #include <sys/param.h>
-
 #include <rpc/rpc.h>
+#include <shlib-compat.h>
 
 /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
 

diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index e5225c5caf6d354edabb3380986c09906e331363..ccbf9bb69b6f833836bbb32e8f1cd8e8cac74501 100644 (file)
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -1,10 +1,10 @@
 #include <stdio.h>
-#include <libc-lock.h>
 #include <rpc/rpc.h>
 #include <assert.h>
 
 #include <libc-lock.h>
 #include <libc-tsd.h>
+#include <shlib-compat.h>
 
 #ifdef _RPC_THREAD_SAFE_
 

diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
index d224624f8bc8bbf85f85f967752eefe0e328d37f..e3cffe26d488155d51e49c549ffc140c6b850ea4 100644 (file)
--- a/sunrpc/rtime.c
+++ b/sunrpc/rtime.c
@@ -49,6 +49,7 @@
 #include <rpc/auth_des.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include <shlib-compat.h>
 
 #define NYEARS (u_long)(1970 - 1900)
 #define TOFFSET (u_long)(60*60*24*(365*NYEARS + (NYEARS/4)))

diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index 03f963018cedece7261207553a45ada4737458fb..f713e2eb7229e904c8a62f9ee0dd15f61506f1ab 100644 (file)
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -59,6 +59,7 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/poll.h>
 #include <time.h>
+#include <shlib-compat.h>
 
 #ifdef _RPC_THREAD_SAFE_
 #define xports RPC_THREAD_VARIABLE(svc_xports_s)

diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
index f33bda2f2062d182a5447a2279d6e6dd89131828..5bca9557e328139c7f13089b459fc3701b5dc101 100644 (file)
--- a/sunrpc/svc_auth.c
+++ b/sunrpc/svc_auth.c
@@ -34,6 +34,7 @@
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 #include <rpc/svc_auth.h>
+#include <shlib-compat.h>
 
 /*
  * svcauthsw is the bdevsw of server side authentication.

diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
index 99bfdfebe87484cb470089b15639d29f58b83a4d..4787203613d241a751dabc83c8986df97d1ffeca 100644 (file)
--- a/sunrpc/svc_raw.c
+++ b/sunrpc/svc_raw.c
@@ -36,6 +36,7 @@
 
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
+#include <shlib-compat.h>
 
 /*
  * This is the "network" that we will be moving data over

diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
index 90dfc94056088ceca602c1989b09eecf5a99a242..e563707fcc53519058ddcff8864e958b4e3f3af5 100644 (file)
--- a/sunrpc/svc_run.c
+++ b/sunrpc/svc_run.c
@@ -36,6 +36,7 @@
 #include <libintl.h>
 #include <sys/poll.h>
 #include <rpc/rpc.h>
+#include <shlib-compat.h>
 
 /* This function can be used as a signal handler to terminate the
    server loop.  */

diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
index db855a3f51e8195b3f6cc05d20c5c5b6741fd1bf..fd9c1e83cab7af67e874d161d3f30319b681ad6f 100644 (file)
--- a/sunrpc/svc_tcp.c
+++ b/sunrpc/svc_tcp.c
@@ -64,6 +64,7 @@
 
 #include <wchar.h>
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
 
 /*
  * Ops vector for TCP/IP based rpc service handle

diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 5f6219f91ceb3f094439b83aa964cd698bef9a57..1592bcca9e78a3a457213d8204e8739da7cfa271 100644 (file)
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -64,6 +64,7 @@
 
 #include <wchar.h>
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX

diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
index 47f1f8487d1b1145bac76b01113cf4a96933296d..a8da3b226297ce211a2cdfefc152be26f8ca1a60 100644 (file)
--- a/sunrpc/svc_unix.c
+++ b/sunrpc/svc_unix.c
@@ -64,6 +64,7 @@
 #include <stdlib.h>
 #include <libintl.h>
 #include <wchar.h>
+#include <shlib-compat.h>
 
 /*
  * Ops vector for AF_UNIX based rpc service handle

diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
index a0f961db125c5e05fece0ebf61ab57bbf87d0242..8e6cb86e39ac5cc266bf0ff600e28ab8a042a82b 100644 (file)
--- a/sunrpc/svcauth_des.c
+++ b/sunrpc/svcauth_des.c
@@ -53,6 +53,7 @@
 #include <rpc/svc_auth.h>
 #include <rpc/svc.h>
 #include <rpc/des_crypt.h>
+#include <shlib-compat.h>
 
 #define debug(msg)             /*printf("svcauth_des: %s\n", msg) */
 

diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
index bfabf337c797a1b6ba875a34359e7e6f3c52837f..8b0b91995b79b859a8ff12d81f1720368b645b16 100644 (file)
--- a/sunrpc/xdr.c
+++ b/sunrpc/xdr.c
@@ -44,6 +44,7 @@
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
+#include <shlib-compat.h>
 
 
 /*

diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
index 99a1d5d24520572fefeb84c4bfa3be4aeaf94836..18383d437ebab359dcd0dc83fb80f45a32bf1386 100644 (file)
--- a/sunrpc/xdr_array.c
+++ b/sunrpc/xdr_array.c
@@ -41,6 +41,7 @@
 #include <libintl.h>
 #include <limits.h>
 #include <wchar.h>
+#include <shlib-compat.h>
 
 #define LASTUNSIGNED   ((u_int)0-1)
 

diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
index 4ce8ae7a9c314e979cf5a354ca0f28303c00184f..844a96e56ea29ae030a16861c6fb2b6aeab3756c 100644 (file)
--- a/sunrpc/xdr_float.c
+++ b/sunrpc/xdr_float.c
@@ -40,6 +40,7 @@
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
+#include <shlib-compat.h>
 
 /*
  * NB: Not portable.

diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c
index 1eb7d0390135c39380ae6e5187471fac791a1e3a..4fd9ada68753a04d2ffa7a857de7804f5a4585d9 100644 (file)
--- a/sunrpc/xdr_intXX_t.c
+++ b/sunrpc/xdr_intXX_t.c
@@ -22,6 +22,7 @@
 #include <rpc/xdr.h>
 
 #include <stdint.h>
+#include <shlib-compat.h>
 
 /* XDR 64bit integers */
 bool_t

diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
index 8b9858959476ad8bee7f7eaa7250c516beda55b4..46a1f6f1903dd961cc30faa7987da49939649f6d 100644 (file)
--- a/sunrpc/xdr_mem.c
+++ b/sunrpc/xdr_mem.c
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <limits.h>
 #include <rpc/rpc.h>
+#include <shlib-compat.h>
 
 static bool_t xdrmem_getlong (XDR *, long *);
 static bool_t xdrmem_putlong (XDR *, const long *);

diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
index 9d79ace4b70f3a43d2ace2ef2e4929349f167832..fafa591c7c8746d3e1307bec694921620dec26d5 100644 (file)
--- a/sunrpc/xdr_rec.c
+++ b/sunrpc/xdr_rec.c
@@ -50,6 +50,7 @@
 #include <libintl.h>
 #include <wchar.h>
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
 
 static bool_t xdrrec_getlong (XDR *, long *);
 static bool_t xdrrec_putlong (XDR *, const long *);

diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
index 2b7ebc8e11ca4dab20877cbaec042666195c6f7f..eab3b742277913b75a5c4ae541b265c1d5fe2eae 100644 (file)
--- a/sunrpc/xdr_ref.c
+++ b/sunrpc/xdr_ref.c
@@ -41,6 +41,7 @@
 #include <libintl.h>
 #include <wchar.h>
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
 
 #define LASTUNSIGNED   ((u_int)0-1)
 

diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
index 56e870a455139a97646a1d4bdb2860123bc02476..1592406d6462fe6e2857225b655f6e17719d358e 100644 (file)
--- a/sunrpc/xdr_sizeof.c
+++ b/sunrpc/xdr_sizeof.c
@@ -38,6 +38,7 @@
 #include <rpc/xdr.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#include <shlib-compat.h>
 
 /* ARGSUSED */
 static bool_t

diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index faa646d29af257dc0147b20ed76399145352811b..6ab514b664705e8ea7b4c5ee1a48e20289265ebd 100644 (file)
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -40,6 +40,8 @@
 #include <rpc/xdr.h>
 
 #include <libio/iolibio.h>
+#include <shlib-compat.h>
+
 #define fflush(s) _IO_fflush (s)
 #define fread(p, m, n, s) _IO_fread (p, m, n, s)
 #define ftell(s) _IO_ftell (s)