--- a/ChangeLog	Mon Apr 25 21:03:02 2011 +0200
+++ b/ChangeLog	Mon Apr 25 17:33:42 2011 -0700
@@ -1,3 +1,16 @@
+2011-04-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	strtoimax, strtoumax: simplify, port to HP-UX 11.00 64-bit
+	This supports apps that need pointers to strtoimax and strtoumax,
+	and ports to HP-UX 11.00 64.bit, which has macros that expand to
+	nonexistent functions.  See
+	<http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00241.html>
+	et seq.
+	* lib/inttypes.in.h (strtoimax, strtoumax): #undef before declaring.
+	* m4/strtoimax.m4 (gl_FUNC_STRTOIMAX): Don't check whether it's
+	a macro.
+	* m4/strtoumax.m4 (gl_FUNC_STRTOUMAX): Likewise.
+
 2011-04-25  Simon Josefsson  <simon@josefsson.org>
 
 	* modules/gnumakefile (configure.ac): Replace TAB with SPCs.

--- a/lib/inttypes.in.h	Mon Apr 25 21:03:02 2011 +0200
+++ b/lib/inttypes.in.h	Mon Apr 25 17:33:42 2011 -0700
@@ -1076,6 +1076,7 @@
 
 #if @GNULIB_STRTOIMAX@
 # if !@HAVE_DECL_STRTOIMAX@
+#  undef strtoimax
 extern intmax_t strtoimax (const char *, char **, int) _GL_ARG_NONNULL ((1));
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1088,6 +1089,7 @@
 
 #if @GNULIB_STRTOUMAX@
 # if !@HAVE_DECL_STRTOUMAX@
+#  undef strtoumax
 extern uintmax_t strtoumax (const char *, char **, int) _GL_ARG_NONNULL ((1));
 # endif
 #elif defined GNULIB_POSIXCHECK

--- a/m4/strtoimax.m4	Mon Apr 25 21:03:02 2011 +0200
+++ b/m4/strtoimax.m4	Mon Apr 25 17:33:42 2011 -0700
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 8
+# strtoimax.m4 serial 9
 dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,16 +6,12 @@
 
 AC_DEFUN([gl_FUNC_STRTOIMAX],
 [
-  AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
-    gl_cv_func_strtoimax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
-#ifdef strtoimax
- inttypes_h_defines_strtoimax
-#endif],
-       gl_cv_func_strtoimax_macro=yes,
-       gl_cv_func_strtoimax_macro=no)])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  if test "$gl_cv_func_strtoimax_macro" != yes; then
+  AC_CHECK_DECLS_ONCE([strtoimax])
+  if test "$ac_cv_have_decl_strtoimax" != yes; then
+    HAVE_DECL_STRTOIMAX=0
+
     AC_REPLACE_FUNCS([strtoimax])
     if test $ac_cv_func_strtoimax = no; then
       gl_PREREQ_STRTOIMAX

--- a/m4/strtoumax.m4	Mon Apr 25 21:03:02 2011 +0200
+++ b/m4/strtoumax.m4	Mon Apr 25 17:33:42 2011 -0700
@@ -1,4 +1,4 @@
-# strtoumax.m4 serial 8
+# strtoumax.m4 serial 9
 dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,16 +6,12 @@
 
 AC_DEFUN([gl_FUNC_STRTOUMAX],
 [
-  AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
-    gl_cv_func_strtoumax_macro,
-    [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
-#ifdef strtoumax
- inttypes_h_defines_strtoumax
-#endif],
-       gl_cv_func_strtoumax_macro=yes,
-       gl_cv_func_strtoumax_macro=no)])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
 
-  if test "$gl_cv_func_strtoumax_macro" != yes; then
+  AC_CHECK_DECLS_ONCE([strtoumax])
+  if test "$ac_cv_have_decl_strtoumax" != yes; then
+    HAVE_DECL_STRTOUMAX=0
+
     AC_REPLACE_FUNCS([strtoumax])
     if test $ac_cv_func_strtoumax = no; then
       gl_PREREQ_STRTOUMAX