progname in gettext has changed.

[gnulib.git] / lib / nanosleep.c

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 0adad88..902fd2d 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -1,5 +1,5 @@
 /* Provide a replacement for the POSIX nanosleep function.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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,7 +36,14 @@ extern int errno;
 # include <unistd.h>
 #endif
 
-#include "nanosleep.h"
+/* 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 "timespec.h"
 
 static int suspended;
 int first_call = 1;
@@ -58,8 +70,8 @@ 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_NOCLDSTOP
   struct sigaction oldact, newact;