X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fposixver.c;h=0e75676f9691e1afa2f60b6606836cc2bb2d063d;hb=3054e0c0b6c3f998ea52d8d25fc2bf1700a093ca;hp=d4761edf960dc0b51c7c59012821ba8f569851f6;hpb=24ae20fb048992858350c0884b5553c7b76a1bdc;p=gnulib.git

diff --git a/lib/posixver.c b/lib/posixver.c
index d4761edf9..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, 2003 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,31 +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 "posixver.h"
+
 #include <limits.h>
 #include <stdlib.h>
 
-#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)