From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 2 Apr 2011 01:10:01 +0000 (-0400)
Subject: remove obsolete and useless useconds_t type
X-Git-Tag: v0.7.5~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5243e5f1606a9c6fcf01414e;p=oweals%2Fmusl.git

remove obsolete and useless useconds_t type
---

diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index c6201b9d..cbdbea0a 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -68,7 +68,6 @@ TYPEDEF long long          intmax_t;
 TYPEDEF unsigned long long uintmax_t;
 
 TYPEDEF long time_t;
-TYPEDEF unsigned useconds_t;
 TYPEDEF int suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index d7ba25bb..1d0abf9c 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -68,7 +68,6 @@ TYPEDEF long long          intmax_t;
 TYPEDEF unsigned long long uintmax_t;
 
 TYPEDEF long time_t;
-TYPEDEF long useconds_t;
 TYPEDEF long suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
diff --git a/include/unistd.h b/include/unistd.h
index f819429e..a3561114 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -29,7 +29,6 @@ extern "C" {
 #define __NEED_gid_t
 #define __NEED_off_t
 #define __NEED_pid_t
-#define __NEED_useconds_t
 #define __NEED_intptr_t
 
 #include <bits/alltypes.h>
@@ -152,8 +151,8 @@ int vhangup(void);
 int chroot(const char *);
 int getpagesize(void);
 int sethostname(const char *, size_t);
-int usleep(useconds_t);
-useconds_t ualarm(useconds_t, useconds_t);
+int usleep(unsigned);
+unsigned ualarm(unsigned, unsigned);
 int setgroups(int, const gid_t []);
 #endif
 
diff --git a/src/unistd/ualarm.c b/src/unistd/ualarm.c
index be853035..1eb08692 100644
--- a/src/unistd/ualarm.c
+++ b/src/unistd/ualarm.c
@@ -2,7 +2,7 @@
 #include "syscall.h"
 
 /* FIXME: ?? */
-useconds_t ualarm(useconds_t useconds, useconds_t interval)
+unsigned ualarm(unsigned useconds, unsigned interval)
 {
 	return -1;
 }
diff --git a/src/unistd/usleep.c b/src/unistd/usleep.c
index e3869017..ce1c8144 100644
--- a/src/unistd/usleep.c
+++ b/src/unistd/usleep.c
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <time.h>
 
-int usleep(useconds_t useconds)
+int usleep(unsigned useconds)
 {
 	struct timespec tv = {
 		.tv_sec = useconds/1000000,