aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-31 10:25:10 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-31 10:25:10 +0000
commitf7f7f8150a52fd01eeedf17fa241d9cc0cf36842 (patch)
treeeef37117ca6e8108eb20b0c0411d2a5486386361
parent245eab025f92980428a499e6d7f4845f6ceaadc8 (diff)
downloadglibc-f7f7f8150a52fd01eeedf17fa241d9cc0cf36842.tar
glibc-f7f7f8150a52fd01eeedf17fa241d9cc0cf36842.tar.gz
glibc-f7f7f8150a52fd01eeedf17fa241d9cc0cf36842.tar.bz2
glibc-f7f7f8150a52fd01eeedf17fa241d9cc0cf36842.zip
Update.
* include/time.h: Add libc_hidden_proto for __nanosleep. * sysdeps/generic/nanosleep.c: Add libc_hidden_def for __nanosleep. * sysdeps/mach/nanosleep.c: Likewise. * sysdeps/unix/sysv/aix/nanosleep.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add __GI___nanosleep alias.
-rw-r--r--ChangeLog6
-rw-r--r--include/time.h1
-rw-r--r--nptl/libc-cancellation.c2
-rw-r--r--sysdeps/generic/nanosleep.c3
-rw-r--r--sysdeps/mach/nanosleep.c1
-rw-r--r--sysdeps/unix/sysv/aix/nanosleep.c3
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list2
7 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index be20b81001..f3c01c93a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-12-31 Ulrich Drepper <drepper@redhat.com>
+ * include/time.h: Add libc_hidden_proto for __nanosleep.
+ * sysdeps/generic/nanosleep.c: Add libc_hidden_def for __nanosleep.
+ * sysdeps/mach/nanosleep.c: Likewise.
+ * sysdeps/unix/sysv/aix/nanosleep.c: Likewise.
+ * sysdeps/unix/sysv/linux/syscalls.list: Add __GI___nanosleep alias.
+
* libio/libioP.h: Add libc_hidden_proto for _IO_list_lock,
_IO_list_unlock, and _IO_list_resetlock.
* libio/genops.c: Add libc_hidden_def for _IO_list_lock,
diff --git a/include/time.h b/include/time.h
index b57b7be1b4..145f888c43 100644
--- a/include/time.h
+++ b/include/time.h
@@ -75,6 +75,7 @@ extern long int __tzname_max (void);
extern int __nanosleep (__const struct timespec *__requested_time,
struct timespec *__remaining);
+libc_hidden_proto(__nanosleep)
extern int __getdate_r (__const char *__string, struct tm *__resbufp);
diff --git a/nptl/libc-cancellation.c b/nptl/libc-cancellation.c
index 1db99ea18a..713ac8ecea 100644
--- a/nptl/libc-cancellation.c
+++ b/nptl/libc-cancellation.c
@@ -23,7 +23,7 @@
#include "atomic.h"
-#if !defined NOT_IN_libc
+#ifndef NOT_IN_libc
/* The next two functions are similar to pthread_setcanceltype() but
more specialized for the use in the cancelable functions like write().
diff --git a/sysdeps/generic/nanosleep.c b/sysdeps/generic/nanosleep.c
index 0ff7036c5c..7a2138b6f1 100644
--- a/sysdeps/generic/nanosleep.c
+++ b/sysdeps/generic/nanosleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2002 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
@@ -31,5 +31,6 @@ __libc_nanosleep (const struct timespec *requested_time,
stub_warning (nanosleep)
weak_alias (__libc_nanosleep, __nanosleep)
+libc_hidden_def (__nanosleep)
weak_alias (__libc_nanosleep, nanosleep)
#include <stub-tag.h>
diff --git a/sysdeps/mach/nanosleep.c b/sysdeps/mach/nanosleep.c
index 8484a99001..e433adb8bc 100644
--- a/sysdeps/mach/nanosleep.c
+++ b/sysdeps/mach/nanosleep.c
@@ -50,4 +50,5 @@ __nanosleep (const struct timespec *requested_time,
return 0;
}
+libc_hidden_def (__nanosleep)
weak_alias (__nanosleep, nanosleep)
diff --git a/sysdeps/unix/sysv/aix/nanosleep.c b/sysdeps/unix/sysv/aix/nanosleep.c
index 3c6e5082e6..842275f77a 100644
--- a/sysdeps/unix/sysv/aix/nanosleep.c
+++ b/sysdeps/unix/sysv/aix/nanosleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002 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
@@ -36,4 +36,5 @@ __libc_nanosleep (const struct timespec *req, struct timespec *rem)
return _nsleep ((struct timestruc_t *) req, (struct timestruc_t *) rem);
}
strong_alias (__libc_nanosleep, __nanosleep)
+libc_hidden_def (__nanosleep)
strong_alias (__libc_nanosleep, nanosleep)
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 738cad7b88..5e11be0ea0 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -37,7 +37,7 @@ mount EXTRA mount i:sssip __mount mount
mremap EXTRA mremap b:aini __mremap mremap
munlock - munlock i:ai munlock
munlockall - munlockall i: munlockall
-nanosleep - nanosleep Ci:pp __libc_nanosleep __nanosleep nanosleep
+nanosleep - nanosleep Ci:pp __libc_nanosleep __nanosleep nanosleep _GI___nanosleep
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
pause - pause Ci: __libc_pause pause
personality init-first personality i:i __personality personality