X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fposixver.c;h=d2b88d40ee5b2c244256af8fe13a569c780ad8a8;hb=5833dfd948db783dcfd90e1273104b778e2ec773;hp=c45ac315bcfab0ccb5aa9d2f431245bcec26507a;hpb=3e9cf3058c4227806e32d9f5152aa419b4f94d2a;p=gnulib.git

diff --git a/lib/posixver.c b/lib/posixver.c
index c45ac315b..d2b88d40e 100644
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -1,49 +1,45 @@
 /* Which POSIX version to conform to, for utilities.
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   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 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
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-#include <limits.h>
+#include "posixver.h"
 
+#include <limits.h>
 #include <stdlib.h>
-#if !HAVE_DECL_GETENV && !defined getenv
-char *getenv ();
-#endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #ifndef _POSIX2_VERSION
 # define _POSIX2_VERSION 0
 #endif
 
+#ifndef DEFAULT_POSIX2_VERSION
+# define DEFAULT_POSIX2_VERSION _POSIX2_VERSION
+#endif
+
 /* The POSIX version that utilities should conform to.  The default is
    specified by the system.  */
 
 int
 posix2_version (void)
 {
-  long int v = _POSIX2_VERSION;
+  long int v = DEFAULT_POSIX2_VERSION;
   char const *s = getenv ("_POSIX2_VERSION");
 
   if (s && *s)
@@ -51,7 +47,7 @@ posix2_version (void)
       char *e;
       long int i = strtol (s, &e, 10);
       if (! *e)
-	v = i;
+        v = i;
     }
 
   return v < INT_MIN ? INT_MIN : v < INT_MAX ? v : INT_MAX;