@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <rpcsvc/nis.h>
+#include <string.h>
#include <shlib-compat.h>
nis_name
@@ -31,6 +31,7 @@
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
+#include <string.h>
#include <shlib-compat.h>
/* The NIS v2 protocol suggests 1024 bytes as a maximum length of all fields.
@@ -539,7 +539,6 @@ HEADER_ALLOWED_INCLUDES = {
"sys/types.h": [ "endian.h" ],
"sys/uio.h": [ "sys/types.h" ],
- "sys/un.h": [ "string.h" ],
# POSIX networking headers
# allowed: netdb.h -> netinet/in.h
@@ -34,11 +34,13 @@ struct sockaddr_un
#ifdef __USE_MISC
-# include <string.h> /* For prototype of `strlen'. */
+#include <bits/types/size_t.h>
+
+extern size_t strlen (const char *__s)
+ __THROW __attribute_pure__ __nonnull ((1));
/* Evaluate to actual length of the `sockaddr_un' structure. */
-# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
- + strlen ((ptr)->sun_path))
+# define SUN_LEN(ptr) (__SOCKADDR_COMMON_SIZE + strlen ((ptr)->sun_path))
#endif
__END_DECLS
@@ -53,6 +53,7 @@
*/
#include <errno.h>
+#include <string.h>
#include <unistd.h>
#include <rpc/rpc.h>
#include <rpc/svc.h>