projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(get_charset_aliases): Use malloc, realloc and memcpy
[gnulib.git]
/
lib
/
nanosleep.c
diff --git
a/lib/nanosleep.c
b/lib/nanosleep.c
index
1f17c09
..
4cfe21b
100644
(file)
--- a/
lib/nanosleep.c
+++ b/
lib/nanosleep.c
@@
-18,6
+18,11
@@
/* written by Jim Meyering */
#include <config.h>
/* written by Jim Meyering */
#include <config.h>
+
+/* Undefine nanosleep here so any prototype is not redefined to be a
+ prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2) */
+#undef nanosleep
+
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
@@
-58,10
+63,10
@@
my_usleep (const struct timespec *ts_delay)
/* FIXME: comment */
int
/* FIXME: comment */
int
-nanosleep (const struct timespec *requested_delay,
- struct timespec *remaining_delay)
+
rpl_
nanosleep (const struct timespec *requested_delay,
+
struct timespec *remaining_delay)
{
{
-#ifdef SA_
INTERRUPT
+#ifdef SA_
NOCLDSTOP
struct sigaction oldact, newact;
#endif
struct sigaction oldact, newact;
#endif
@@
-70,7
+75,7
@@
nanosleep (const struct timespec *requested_delay,
/* set up sig handler */
if (first_call)
{
/* set up sig handler */
if (first_call)
{
-#ifdef SA_
INTERRUPT
+#ifdef SA_
NOCLDSTOP
newact.sa_handler = sighandler;
sigemptyset (&newact.sa_mask);
newact.sa_flags = 0;
newact.sa_handler = sighandler;
sigemptyset (&newact.sa_mask);
newact.sa_flags = 0;