Page MenuHomeFreeBSD

D44042.diff
No OneTemporary

D44042.diff

diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -137,6 +137,7 @@
siglist.c \
signal.c \
sigsetops.c \
+ sleep.c \
srand48.c \
statvfs.c \
stringlist.c \
@@ -160,6 +161,7 @@
ulimit.c \
uname.c \
unvis-compat.c \
+ usleep.c \
utime.c \
utxdb.c \
valloc.c \
diff --git a/lib/libsys/sleep.c b/lib/libc/gen/sleep.c
rename from lib/libsys/sleep.c
rename to lib/libc/gen/sleep.c
--- a/lib/libsys/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -56,7 +56,7 @@
time_to_sleep.tv_sec = seconds;
time_to_sleep.tv_nsec = 0;
if (((int (*)(const struct timespec *, struct timespec *))
- __libsys_interposing[INTERPOS_nanosleep])(
+ (*__libsys_interposing_slot(INTERPOS_nanosleep)))(
&time_to_sleep, &time_remaining) != -1)
return (0);
if (errno != EINTR)
diff --git a/lib/libsys/usleep.c b/lib/libc/gen/usleep.c
rename from lib/libsys/usleep.c
rename to lib/libc/gen/usleep.c
--- a/lib/libsys/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -46,7 +46,8 @@
time_to_sleep.tv_nsec = (useconds % 1000000) * 1000;
time_to_sleep.tv_sec = useconds / 1000000;
return (((int (*)(const struct timespec *, struct timespec *))
- __libsys_interposing[INTERPOS_nanosleep])(&time_to_sleep, NULL));
+ (*__libsys_interposing_slot(INTERPOS_nanosleep)))(&time_to_sleep,
+ NULL));
}
__weak_reference(__usleep, usleep);
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -40,7 +40,7 @@
SRCS+= getdents.c lstat.c mknod.c stat.c
SRCS+= creat.c
-SRCS+= lockf.c sleep.c usleep.c wait.c wait3.c waitpid.c waitid.c
+SRCS+= lockf.c wait.c wait3.c waitpid.c waitid.c
SRCS+= recv.c recvmmsg.c send.c sendmmsg.c
NOASM+= sched_getcpu.o

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 11, 2:46 PM (20 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15754717
Default Alt Text
D44042.diff (1 KB)

Event Timeline