getpagesize: Fix C++ test error on mingw.

diff --git a/ChangeLog b/ChangeLog
index f39ca5a1ac28f6c0d163673c59cc85004d94fc24..fc64c562b99c58ad26013418dea6a6caf0971443 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-03  Bruno Haible  <bruno@clisp.org>
+
+       getpagesize: Fix C++ test error on mingw.
+       * lib/unistd.in.h (getpagesize): Don't use _GL_CXXALIASWARN if the
+       system does not declare the function.
+       * m4/getpagesize.m4 (gl_FUNC_GETPAGESIZE): Also check whether it's
+       declared.
+       * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize
+       HAVE_DECL_GETPAGESIZE.
+       * modules/unistd (Makefile.am): Substitute HAVE_DECL_GETPAGESIZE.
+
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
        stdio: Make C++ tests work on mingw.

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index cc8a629ef19709efeecb754589ffe0ba3f233bbd..0d3946436dcdffb7e1085a2702c5dd593e2b567e 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -775,7 +775,9 @@ getpagesize ()
 /* Need to cast, because on Cygwin 1.5.x systems, the return type is size_t.  */
 _GL_CXXALIAS_SYS_CAST (getpagesize, int, (void));
 # endif
+# if @HAVE_DECL_GETPAGESIZE@
 _GL_CXXALIASWARN (getpagesize);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getpagesize
 # if HAVE_RAW_DECL_GETPAGESIZE

diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index 8968516e2c7f462e4ed028cd286193d46304bb82..313ad7fa26c4bc3f28179c06ce16095ca8d11ba3 100644 (file)
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,4 +1,4 @@
-# getpagesize.m4 serial 7
+# getpagesize.m4 serial 8
 dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -27,4 +27,7 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE],
       AC_LIBOBJ([getpagesize])
       ;;
   esac
+  dnl Also check whether it's declared.
+  dnl mingw has getpagesize() in libgcc.a but doesn't declare it.
+  AC_CHECK_DECL([getpagesize], , [HAVE_DECL_GETPAGESIZE=0])
 ])

diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 789739dffa7fcb5c08bdd081b3fbf5f412facdf2..5e4515f469c447bcb16053e542c6d4e44b8aa07c 100644 (file)
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 43
+# unistd_h.m4 serial 44
 dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -122,6 +122,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
   HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
+  HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])

diff --git a/modules/unistd b/modules/unistd
index f4e16bf8f5175cc950dbda18284f659394f6e649..9fc32c86c85649158199ccb93fb5a0421e8f1d5c 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -96,6 +96,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
              -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
              -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+             -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
              -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
              -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
              -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \