X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fposixver.c;h=0e75676f9691e1afa2f60b6606836cc2bb2d063d;hb=1657e8ea4800a0ecbd67c05e6b8896b37720110b;hp=9467a78cdb71cc19db74b7f5b6d2c685b7e004ff;hpb=4589d52c7c039b9d9c9d7bec075f00c9d57ee6e1;p=gnulib.git

diff --git a/lib/posixver.c b/lib/posixver.c
index 9467a78cd..0e75676f9 100644
--- a/lib/posixver.c
+++ b/lib/posixver.c
@@ -1,6 +1,6 @@
 /* Which POSIX version to conform to, for utilities.
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 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
@@ -14,35 +14,35 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Paul Eggert.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#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)