summary refs log tree commit diff
path: root/socket/sys/un.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-28 00:00:08 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-28 00:00:08 +0000
commit8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad (patch)
treee52c60e7b4424de720d2c54aee98494f2583d293 /socket/sys/un.h
parent09a2231b580ea777c6bb72f6815491ae035faeea (diff)
downloadglibc-8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad.tar.gz
glibc-8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad.tar.xz
glibc-8be918b7bb2abe46fab6c5f6e8ce3bac4da143ad.zip
Update.
	* conform/data/sys/time.h-data: Allow sys/select.h.
	* conform/data/sys/un.h-data: Fix typo.
	* time/sys/time.h: Don't include all of <time.h>, just struct timeval.
	* sysdeps/posix/clock_getres.c: Include <time.h> instead of
	<sys/time.h>.
	* sysdeps/unix/clock_nanosleep.c: Likewise.
	* sysdeps/unix/i386/clock_getcpuclockid.c: Likewise.
	* sysdeps/unix/i386/i586/clock_getres.c: Likewise.
	* sysdeps/unix/clock_gettime.c: Also include <time.h>.
	* sysdeps/unix/clock_settime.c: Likewise.

	* sysdeps/generic/pselect.c: Include <stddef.h> for NULL.
	* login/getutent.c: Likewise.
	* login/getutid.c: Likewise.
	* login/getutline.c: Likewise.

	* socket/sys/un.h: Define SUN_LEN only if __USE_MISC.
Diffstat (limited to 'socket/sys/un.h')
-rw-r--r--socket/sys/un.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/socket/sys/un.h b/socket/sys/un.h
index 03f36058bf..c2b177bae3 100644
--- a/socket/sys/un.h
+++ b/socket/sys/un.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,8 +21,6 @@
 
 #include <sys/cdefs.h>
 
-#include <string.h>		/* For prototype of `strlen'.  */
-
 /* Get the definition of the macro to define the common sockaddr members.  */
 #include <bits/sockaddr.h>
 
@@ -36,9 +34,13 @@ struct sockaddr_un
   };
 
 
+#ifdef __USE_MISC
+# include <string.h>		/* For prototype of `strlen'.  */
+
 /* Evaluate to actual length of the `sockaddr_un' structure.  */
-#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
 		      + strlen ((ptr)->sun_path))
+#endif
 
 __END_DECLS