aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-18 01:18:34 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-18 01:18:34 +0000
commit7707af891e521bc7c77db974bfdbeacd85ee5269 (patch)
treef1b7544e37ae019cb22768df5292e8740dd74618
parent56c55d5d4a8ef51ef424cbfcb9eca2b2fa95e419 (diff)
downloadglibc-7707af891e521bc7c77db974bfdbeacd85ee5269.zip
glibc-7707af891e521bc7c77db974bfdbeacd85ee5269.tar.gz
glibc-7707af891e521bc7c77db974bfdbeacd85ee5269.tar.bz2
Update.
* posix/sys/types.h: Define type useconds_t if not done already. * posix/unistd.h: Likewise. Use this in ualarm and usleep declarations. * sysdeps/generic/bits/types.h: Define type __useconds_t. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
-rw-r--r--ChangeLog10
-rw-r--r--bits/types.h1
-rw-r--r--posix/sys/types.h4
-rw-r--r--posix/unistd.h11
-rw-r--r--sysdeps/generic/bits/types.h1
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/types.h1
-rw-r--r--sysdeps/unix/sysv/linux/bits/types.h1
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/types.h1
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/types.h1
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/bits/types.h1
10 files changed, 29 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 02f2921..70c28b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
1999-08-17 Ulrich Drepper <drepper@cygnus.com>
+ * posix/sys/types.h: Define type useconds_t if not done already.
+ * posix/unistd.h: Likewise. Use this in ualarm and usleep
+ declarations.
+ * sysdeps/generic/bits/types.h: Define type __useconds_t.
+ * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
+ * sysdeps/unix/sysv/linux/bits/types.h: Likewise.
+ * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
+ * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
+
* dirent/dirent.h (telldir): Change return type to long int.
* sysdeps/generic/telldir.c: Likewise.
* sysdeps/mach/hurd/telldir.c: Likewise.
diff --git a/bits/types.h b/bits/types.h
index ecf86ce..919e703 100644
--- a/bits/types.h
+++ b/bits/types.h
@@ -80,6 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */
typedef long int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
+typedef int __useconds_t;
typedef long int __suseconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef long int __key_t; /* Type of an IPC key */
diff --git a/posix/sys/types.h b/posix/sys/types.h
index be37340..7a0b382 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -121,6 +121,10 @@ typedef __key_t key_t;
#include <time.h>
#ifdef __USE_XOPEN
+# ifndef __useconds_t_defined
+typedef __useconds_t useconds_t;
+# define __useconds_t_defined
+# endif
typedef __suseconds_t suseconds_t;
#endif
diff --git a/posix/unistd.h b/posix/unistd.h
index d8800b7..3437030 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -224,6 +224,11 @@ typedef __off64_t off64_t;
# define __off64_t_defined
# endif
+# ifndef __useconds_t_defined
+typedef __useconds_t useconds_t;
+# define __useconds_t_defined
+# endif
+
# ifndef __pid_t_defined
typedef __pid_t pid_t;
# define __pid_t_defined
@@ -371,12 +376,12 @@ extern unsigned int sleep __P ((unsigned int __seconds));
microseconds. If INTERVAL is nonzero, when the alarm goes off, the
timer is reset to go off every INTERVAL microseconds thereafter.
Returns the number of microseconds remaining before the alarm. */
-extern unsigned int ualarm __P ((unsigned int __value,
- unsigned int __interval));
+extern __useconds_t ualarm __P ((__useconds_t __value,
+ __useconds_t __interval));
/* Sleep USECONDS microseconds, or until a signal arrives that is not blocked
or ignored. */
-extern void usleep __P ((unsigned int __useconds));
+extern void usleep __P ((__useconds_t __useconds));
#endif
diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h
index ecf86ce..919e703 100644
--- a/sysdeps/generic/bits/types.h
+++ b/sysdeps/generic/bits/types.h
@@ -80,6 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */
typedef long int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
+typedef int __useconds_t;
typedef long int __suseconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef long int __key_t; /* Type of an IPC key */
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h
index 91b49a2..096d920 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/types.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h
@@ -76,6 +76,7 @@ typedef struct
typedef int __daddr_t; /* Type of a disk address. */
typedef char *__caddr_t; /* Type of a core address. */
typedef long int __time_t;
+typedef int __useconds_t;
typedef long int __suseconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef long int __clock_t;
diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h
index a33b036..0ff0cc5 100644
--- a/sysdeps/unix/sysv/linux/bits/types.h
+++ b/sysdeps/unix/sysv/linux/bits/types.h
@@ -82,6 +82,7 @@ typedef int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
typedef long int __suseconds_t;
+typedef int __useconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef long int __clock_t;
diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h
index 4b63cf8..e1c436f 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/types.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/types.h
@@ -82,6 +82,7 @@ typedef int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
typedef long int __suseconds_t;
+typedef int __useconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef long int __clock_t;
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types.h b/sysdeps/unix/sysv/linux/sparc/bits/types.h
index ac7c0e6..960594f 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/types.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/types.h
@@ -98,6 +98,7 @@ typedef struct
typedef int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
+typedef int __useconds_t;
typedef int __suseconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h
index b2eace3..ec1142c 100644
--- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h
+++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h
@@ -79,6 +79,7 @@ typedef unsigned int __id_t; /* General type for IDs. */
typedef long int __daddr_t; /* The type of a disk address. */
typedef char *__caddr_t;
typedef long int __time_t;
+typedef int __useconds_t;
typedef int __suseconds_t;
typedef long int __swblk_t; /* Type of a swap block maybe? */
typedef int __key_t; /* Type of an IPC key */