(malloc): Undef before defining, since stdlib.h may have defined it.

[gnulib.git] / lib / nanosleep.c

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 1f17c09..c0c1356 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -18,6 +18,11 @@
 /* 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>
@@ -31,6 +36,13 @@ extern int errno;
 # include <unistd.h>
 #endif
 
+/* Some systems (MSDOS) don't have SIGCONT.
+   Using SIGTERM here turns the signal-handling code below
+   into a no-op on such systems. */
+#ifndef SIGCONT
+# define SIGCONT SIGTERM
+#endif
+
 #include "nanosleep.h"
 
 static int suspended;
@@ -58,10 +70,10 @@ my_usleep (const struct timespec *ts_delay)
 /* 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
 
@@ -70,7 +82,7 @@ nanosleep (const struct timespec *requested_delay,
   /* 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;