X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fnanosleep.c;h=456e745ca044545c618647db06a86cd005440630;hb=2fd7e9189c239ef737105bc085ace4dc80435533;hp=bb47268123d47134371dc9ed1b011292c5c13b55;hpb=5661ab9d49512b4cf3c19caa11bb581d8ce561ba;p=gnulib.git

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index bb4726812..456e745ca 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -3,10 +3,10 @@
    Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006, 2007 Free
    Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,16 +14,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* 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 <time.h>
 
 #include "timespec.h"
 
@@ -36,12 +33,12 @@
 #include <signal.h>
 
 #include <sys/time.h>
-#include <time.h>
-
 #include <errno.h>
 
 #include <unistd.h>
 
+#undef nanosleep
+
 enum { BILLION = 1000 * 1000 * 1000 };
 
 #if HAVE_BUG_BIG_NANOSLEEP