diff options
Diffstat (limited to 'sunrpc')
-rw-r--r-- | sunrpc/auth_unix.c | 6 | ||||
-rw-r--r-- | sunrpc/clnt_perr.c | 9 | ||||
-rw-r--r-- | sunrpc/clnt_tcp.c | 4 | ||||
-rw-r--r-- | sunrpc/clnt_udp.c | 4 | ||||
-rw-r--r-- | sunrpc/clnt_unix.c | 4 | ||||
-rw-r--r-- | sunrpc/openchild.c | 8 | ||||
-rw-r--r-- | sunrpc/svc_simple.c | 6 | ||||
-rw-r--r-- | sunrpc/svc_tcp.c | 6 | ||||
-rw-r--r-- | sunrpc/svc_udp.c | 6 | ||||
-rw-r--r-- | sunrpc/svc_unix.c | 5 | ||||
-rw-r--r-- | sunrpc/xdr.c | 4 | ||||
-rw-r--r-- | sunrpc/xdr_array.c | 5 | ||||
-rw-r--r-- | sunrpc/xdr_rec.c | 7 | ||||
-rw-r--r-- | sunrpc/xdr_ref.c | 7 | ||||
-rw-r--r-- | sunrpc/xdr_stdio.c | 12 |
15 files changed, 29 insertions, 64 deletions
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c index 858523e..d3b5dc7 100644 --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle America, Inc. + * Copyright (c) 2010, 2011, Oracle America, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -45,15 +45,13 @@ #include <unistd.h> #include <libintl.h> #include <sys/param.h> +#include <wchar.h> #include <rpc/types.h> #include <rpc/xdr.h> #include <rpc/auth.h> #include <rpc/auth_unix.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif /* * Unix authenticator operations vector diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c index e6b2460..175370e 100644 --- a/sunrpc/clnt_perr.c +++ b/sunrpc/clnt_perr.c @@ -1,7 +1,7 @@ /* * clnt_perror.c * - * Copyright (c) 2010, Oracle America, Inc. + * Copyright (c) 2010, 2011, Oracle America, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -34,11 +34,8 @@ #include <string.h> #include <libintl.h> #include <rpc/rpc.h> - -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.h> static char *auth_errmsg (enum auth_stat stat) internal_function; diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index a07f50a..7cfbe9e 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -53,9 +53,7 @@ #include <sys/poll.h> #include <sys/socket.h> #include <rpc/pmap_clnt.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif +#include <wchar.h> extern u_long _create_xid (void); diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index 83fdd8e..babee9a 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -45,9 +45,7 @@ #include <rpc/pmap_clnt.h> #include <net/if.h> #include <ifaddrs.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif +#include <wchar.h> #include <fcntl.h> #ifdef IP_RECVERR diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index 5d361b3..62dc8c6 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -54,9 +54,7 @@ #include <sys/poll.h> #include <sys/socket.h> #include <rpc/pmap_clnt.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif +#include <wchar.h> extern u_long _create_xid (void); diff --git a/sunrpc/openchild.c b/sunrpc/openchild.c index 18c7d10..541a223 100644 --- a/sunrpc/openchild.c +++ b/sunrpc/openchild.c @@ -41,11 +41,9 @@ #include <rpc/rpc.h> #include <rpc/clnt.h> -#ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define fflush(s) INTUSE(_IO_fflush) (s) -# define __fdopen(fd,m) INTUSE(_IO_fdopen) (fd,m) -#endif +#include <libio/iolibio.h> +#define fflush(s) INTUSE(_IO_fflush) (s) +#define __fdopen(fd,m) INTUSE(_IO_fdopen) (fd,m) /* * returns pid, or -1 for failure diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c index 49b1211..b8ba4ab 100644 --- a/sunrpc/svc_simple.c +++ b/sunrpc/svc_simple.c @@ -41,10 +41,8 @@ #include <sys/socket.h> #include <netdb.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.h> struct proglst_ { diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c index 74f2cd9..e051532 100644 --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -45,10 +45,8 @@ #include <errno.h> #include <stdlib.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.h> /* * Ops vector for TCP/IP based rpc service handle diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 71be4f8..04c8407 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -45,10 +45,8 @@ #include <sys/uio.h> #endif -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.h> #define rpc_buffer(xprt) ((xprt)->xp_p1) #ifndef MAX diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c index c74b2cb..2b02682 100644 --- a/sunrpc/svc_unix.c +++ b/sunrpc/svc_unix.c @@ -46,10 +46,7 @@ #include <errno.h> #include <stdlib.h> #include <libintl.h> - -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif +#include <wchar.h> /* * Ops vector for AF_UNIX based rpc service handle diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c index f770685..4dd82ff 100644 --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -39,13 +39,11 @@ #include <limits.h> #include <string.h> #include <libintl.h> +#include <wchar.h> #include <rpc/types.h> #include <rpc/xdr.h> -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif /* * constants specific to the xdr "protocol" diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c index 05162ec..b832078 100644 --- a/sunrpc/xdr_array.c +++ b/sunrpc/xdr_array.c @@ -40,10 +40,7 @@ #include <rpc/xdr.h> #include <libintl.h> #include <limits.h> - -#ifdef USE_IN_LIBIO -# include <wchar.h> -#endif +#include <wchar.h> #define LASTUNSIGNED ((u_int)0-1) diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c index 1e13d34..556c6c4 100644 --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -47,11 +47,8 @@ #include <unistd.h> #include <rpc/rpc.h> #include <libintl.h> - -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.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 b4bdb52..7510bed 100644 --- a/sunrpc/xdr_ref.c +++ b/sunrpc/xdr_ref.c @@ -39,11 +39,8 @@ #include <rpc/types.h> #include <rpc/xdr.h> #include <libintl.h> - -#ifdef USE_IN_LIBIO -# include <wchar.h> -# include <libio/iolibio.h> -#endif +#include <wchar.h> +#include <libio/iolibio.h> #define LASTUNSIGNED ((u_int)0-1) diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c index c68f004..d986606 100644 --- a/sunrpc/xdr_stdio.c +++ b/sunrpc/xdr_stdio.c @@ -39,13 +39,11 @@ #include <stdio.h> #include <rpc/xdr.h> -#ifdef USE_IN_LIBIO -# include <libio/iolibio.h> -# define fflush(s) INTUSE(_IO_fflush) (s) -# define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s) -# define ftell(s) INTUSE(_IO_ftell) (s) -# define fwrite(p, m, n, s) INTUSE(_IO_fwrite) (p, m, n, s) -#endif +#include <libio/iolibio.h> +#define fflush(s) INTUSE(_IO_fflush) (s) +#define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s) +#define ftell(s) INTUSE(_IO_ftell) (s) +#define fwrite(p, m, n, s) INTUSE(_IO_fwrite) (p, m, n, s) static bool_t xdrstdio_getlong (XDR *, long *); static bool_t xdrstdio_putlong (XDR *, const long *); |