bug-gnulib@gnu.org mirror (unofficial)
 help / color / mirror / Atom feed
* Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
@ 2013-10-09  6:17 Daniel Richard G.
  2013-10-09  6:29 ` Paul Eggert
  0 siblings, 1 reply; 16+ messages in thread
From: Daniel Richard G. @ 2013-10-09  6:17 UTC (permalink / raw
  To: bug-gnulib

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

I encountered the following error in the course of building GNU Bash,
GNU Coreutils and GNU Tar on a 64-bit HP-UX system:

source='../../gllib/strtoimax.c' object='strtoimax.o' libtool=no \
DEPDIR=.deps depmode=none /bin/sh ../../build-aux/depcomp \
cc -DHAVE_CONFIG_H -I. -I../../gllib -I..  -DGNULIB_STRICT_CHECKING=1 -D_HPUX_API_LEVEL=20040821 -DTG_NO_INLINE   -Ae +DD64 +DO11.0 +ESconstlit +ESlit +w1 -z +O3 -c -o strtoimax.o ../../gllib/strtoimax.c
cc: "../../gllib/strtoimax.c", line 62: error 1000: Unexpected symbol: "strtol".
cc: "../../gllib/strtoimax.c", line 62: error 1584: Inconsistent type declaration: "intmax_t".
cc: panic 2017: Cannot recover from earlier errors, terminating.
gmake[4]: *** [strtoimax.o] Error 1
gmake[4]: Leaving directory `/tmp/gltestdir/_build/gllib'


The attached patch fixes the issue for me.


--Daniel


-- 
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnulib-strtoimax-fix.patch --]
[-- Type: text/x-patch; name="gnulib-strtoimax-fix.patch", Size: 342 bytes --]

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index c9bd2ad..f190322 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -45,6 +45,9 @@ long long int strtoll (char const *, char **, int);
 # endif
 #endif
 
+#undef strtoimax
+#undef strtoumax
+
 #ifdef UNSIGNED
 # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09  6:17 Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11 Daniel Richard G.
@ 2013-10-09  6:29 ` Paul Eggert
  2013-10-09  6:51   ` Daniel Richard G.
  0 siblings, 1 reply; 16+ messages in thread
From: Paul Eggert @ 2013-10-09  6:29 UTC (permalink / raw
  To: Daniel Richard G., bug-gnulib

Thanks, I pushed the following, which I hope fixes the problem
in a slightly-more-general way.

>From d619b91857d24f9b9cf97556150e7fa0021347ef Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 8 Oct 2013 23:27:49 -0700
Subject: [PATCH] strtoimax: port to HP-UX 11.11

Problem reported by Daniel Richard G.
* lib/strtoimax.c (Strtoimax, Strtol, Strtoll): New macros.
(strtoimax, strtol, strtoll) [UNSIGNED]: Remove, since
they might clash with inttypes.h.
---
 ChangeLog       |  8 ++++++++
 lib/strtoimax.c | 15 +++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01dca10..1d3cb6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	strtoimax: port to HP-UX 11.11
+	Problem reported by Daniel Richard G.
+	* lib/strtoimax.c (Strtoimax, Strtol, Strtoll): New macros.
+	(strtoimax, strtol, strtoll) [UNSIGNED]: Remove, since
+	they might clash with inttypes.h.
+
 2013-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	New module 'count-trailing-zeros'.
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index c9bd2ad..b4feaf3 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -48,28 +48,31 @@ long long int strtoll (char const *, char **, int);
 #ifdef UNSIGNED
 # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t
+# define Strtoimax strtoumax
+# define Strtol strtoul
+# define Strtoll strtoull
 # define Unsigned unsigned
-# define strtoimax strtoumax
-# define strtol strtoul
-# define strtoll strtoull
 #else
 # define Have_long_long HAVE_LONG_LONG_INT
 # define Int intmax_t
+# define Strtoimax strtoimax
+# define Strtol strtol
+# define Strtoll strtoll
 # define Unsigned
 #endif
 
 Int
-strtoimax (char const *ptr, char **endptr, int base)
+Strtoimax (char const *ptr, char **endptr, int base)
 {
 #if Have_long_long
   verify (sizeof (Int) == sizeof (Unsigned long int)
           || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))
-    return strtoll (ptr, endptr, base);
+    return Strtoll (ptr, endptr, base);
 #else
   verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 
-  return strtol (ptr, endptr, base);
+  return Strtol (ptr, endptr, base);
 }
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09  6:29 ` Paul Eggert
@ 2013-10-09  6:51   ` Daniel Richard G.
  2013-10-09  7:12     ` Paul Eggert
  0 siblings, 1 reply; 16+ messages in thread
From: Daniel Richard G. @ 2013-10-09  6:51 UTC (permalink / raw
  To: Paul Eggert, bug-gnulib

On Tue, 2013 Oct  8 23:29-0700, Paul Eggert wrote:
> Thanks, I pushed the following, which I hope fixes the problem
> in a slightly-more-general way.

Not quite, I'm afraid:

source='../../gllib/strtoimax.c' object='strtoimax.o' libtool=no \
DEPDIR=.deps depmode=none /bin/sh ../../build-aux/depcomp \
cc -DHAVE_CONFIG_H -I. -I../../gllib -I..  -DGNULIB_STRICT_CHECKING=1 -D_HPUX_API_LEVEL=20040821 -DTG_NO_INLINE   -Ae +DD64 +DO11.0 +ESconstlit +ESlit +w1 -z +O3 -c -o strtoimax.o ../../gllib/strtoimax.c
cc: "../../gllib/strtoimax.c", line 65: error 1000: Unexpected symbol: "strtol".
cc: "../../gllib/strtoimax.c", line 65: error 1584: Inconsistent type declaration: "intmax_t".
cc: panic 2017: Cannot recover from earlier errors, terminating.
gmake[4]: *** [strtoimax.o] Error 1


I think the problem is that strtoimax/strtoumax are macros, so Strtoimax
is still expanding into something unexpected:

$ grep strtoimax /usr/include/inttypes.h
#define strtoimax(__a, __b, __c) __strtoll(__a, __b, __c)
#define strtoimax(__a, __b, __c) (intmax_t)strtol(__a, __b, __c)
$ grep strtoumax /usr/include/inttypes.h
#define strtoumax(__a, __b, __c) __strtoull(__a, __b, __c)
#define strtoumax(__a, __b, __c) (uintmax_t)strtoul(__a, __b, __c)


--Daniel


-- 
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09  6:51   ` Daniel Richard G.
@ 2013-10-09  7:12     ` Paul Eggert
  2013-10-09  7:29       ` Daniel Richard G.
  0 siblings, 1 reply; 16+ messages in thread
From: Paul Eggert @ 2013-10-09  7:12 UTC (permalink / raw
  To: Daniel Richard G., bug-gnulib

Daniel Richard G. wrote:
> I think the problem is that strtoimax/strtoumax are macros, so Strtoimax
> is still expanding into something unexpected:

Hmm, why doesn't lib/inttypes.h override those macros?

What is the output of "diff -u lib/inttypes.in.h lib/inttypes.h"
on your host?


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09  7:12     ` Paul Eggert
@ 2013-10-09  7:29       ` Daniel Richard G.
  2013-10-09 15:06         ` Paul Eggert
  0 siblings, 1 reply; 16+ messages in thread
From: Daniel Richard G. @ 2013-10-09  7:29 UTC (permalink / raw
  To: Paul Eggert, bug-gnulib

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

On Wed, 2013 Oct  9 0:12-0700, Paul Eggert wrote:
> 
> Hmm, why doesn't lib/inttypes.h override those macros?
>
> What is the output of "diff -u lib/inttypes.in.h lib/inttypes.h" on
> your host?

See attached.


--Daniel


-- 
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.

[-- Attachment #2: diff.txt --]
[-- Type: text/plain, Size: 43406 bytes --]

--- ./gllib/inttypes.in.h	2013-10-08 23:25:28 -0400
+++ ./_build/gllib/inttypes.h	2013-10-09 02:05:44 -0400
@@ -1,3 +1,4 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Copyright (C) 2006-2013 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
@@ -21,23 +22,23 @@
  */
 
 #if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
+
 #endif
-@PRAGMA_COLUMNS@
+
 
 /* Include the original <inttypes.h> if it exists, and if this file
    has not been included yet or if this file includes gnulib stdint.h
    which in turn includes this file.
    The include_next requires a split double-inclusion guard.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-# if @HAVE_INTTYPES_H@
+# if 1
 
    /* Some pre-C++11 <stdint.h> implementations need this.  */
 #  if defined __cplusplus && ! defined __STDC_FORMAT_MACROS
 #   define __STDC_FORMAT_MACROS 1
 #  endif
 
-#  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
+#  include "///usr/include/inttypes.h"
 # endif
 #endif
 
@@ -57,10 +58,321 @@
 #endif
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Example:
+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
+                                  _GL_ARG_NONNULL ((1)));
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
+  _GL_EXTERN_C rettype func parameters_and_attributes
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      rettype (*const func) parameters = ::rpl_func;          \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      rettype (*const func) parameters =                           \
+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+ */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* If we were to write
+       rettype (*const func) parameters = ::func;
+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
+     better (remove an indirection through a 'static' pointer variable),
+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                     \
+    {                                              \
+      static rettype (*func) parameters = ::func;  \
+    }                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static rettype (*func) parameters =               \
+        reinterpret_cast<rettype(*)parameters>(::func); \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static rettype (*func) parameters =                                     \
+        reinterpret_cast<rettype(*)parameters>(                               \
+          (rettype2(*)parameters2)(::func));                                  \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
+   we enable the warning only when not optimizing.  */
+# if !__OPTIMIZE__
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
+#ifndef _GL_WARN_ON_USE
+
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+extern __typeof__ (function) function
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
+   declared with the given prototype, consisting of return type, parameters,
+   and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+     __attribute__ ((__warning__ (msg)))
+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
 
 /* 7.8.1 Macros for format specifiers */
 
@@ -72,259 +384,259 @@
 # define _LONG_LONG_FORMAT_PREFIX "ll"
 #endif
 
-#if !defined PRId8 || @PRI_MACROS_BROKEN@
+#if !defined PRId8 || 0
 # undef PRId8
 # ifdef INT8_MAX
 #  define PRId8 "d"
 # endif
 #endif
-#if !defined PRIi8 || @PRI_MACROS_BROKEN@
+#if !defined PRIi8 || 0
 # undef PRIi8
 # ifdef INT8_MAX
 #  define PRIi8 "i"
 # endif
 #endif
-#if !defined PRIo8 || @PRI_MACROS_BROKEN@
+#if !defined PRIo8 || 0
 # undef PRIo8
 # ifdef UINT8_MAX
 #  define PRIo8 "o"
 # endif
 #endif
-#if !defined PRIu8 || @PRI_MACROS_BROKEN@
+#if !defined PRIu8 || 0
 # undef PRIu8
 # ifdef UINT8_MAX
 #  define PRIu8 "u"
 # endif
 #endif
-#if !defined PRIx8 || @PRI_MACROS_BROKEN@
+#if !defined PRIx8 || 0
 # undef PRIx8
 # ifdef UINT8_MAX
 #  define PRIx8 "x"
 # endif
 #endif
-#if !defined PRIX8 || @PRI_MACROS_BROKEN@
+#if !defined PRIX8 || 0
 # undef PRIX8
 # ifdef UINT8_MAX
 #  define PRIX8 "X"
 # endif
 #endif
-#if !defined PRId16 || @PRI_MACROS_BROKEN@
+#if !defined PRId16 || 0
 # undef PRId16
 # ifdef INT16_MAX
 #  define PRId16 "d"
 # endif
 #endif
-#if !defined PRIi16 || @PRI_MACROS_BROKEN@
+#if !defined PRIi16 || 0
 # undef PRIi16
 # ifdef INT16_MAX
 #  define PRIi16 "i"
 # endif
 #endif
-#if !defined PRIo16 || @PRI_MACROS_BROKEN@
+#if !defined PRIo16 || 0
 # undef PRIo16
 # ifdef UINT16_MAX
 #  define PRIo16 "o"
 # endif
 #endif
-#if !defined PRIu16 || @PRI_MACROS_BROKEN@
+#if !defined PRIu16 || 0
 # undef PRIu16
 # ifdef UINT16_MAX
 #  define PRIu16 "u"
 # endif
 #endif
-#if !defined PRIx16 || @PRI_MACROS_BROKEN@
+#if !defined PRIx16 || 0
 # undef PRIx16
 # ifdef UINT16_MAX
 #  define PRIx16 "x"
 # endif
 #endif
-#if !defined PRIX16 || @PRI_MACROS_BROKEN@
+#if !defined PRIX16 || 0
 # undef PRIX16
 # ifdef UINT16_MAX
 #  define PRIX16 "X"
 # endif
 #endif
-#if !defined PRId32 || @PRI_MACROS_BROKEN@
+#if !defined PRId32 || 0
 # undef PRId32
 # ifdef INT32_MAX
 #  define PRId32 "d"
 # endif
 #endif
-#if !defined PRIi32 || @PRI_MACROS_BROKEN@
+#if !defined PRIi32 || 0
 # undef PRIi32
 # ifdef INT32_MAX
 #  define PRIi32 "i"
 # endif
 #endif
-#if !defined PRIo32 || @PRI_MACROS_BROKEN@
+#if !defined PRIo32 || 0
 # undef PRIo32
 # ifdef UINT32_MAX
 #  define PRIo32 "o"
 # endif
 #endif
-#if !defined PRIu32 || @PRI_MACROS_BROKEN@
+#if !defined PRIu32 || 0
 # undef PRIu32
 # ifdef UINT32_MAX
 #  define PRIu32 "u"
 # endif
 #endif
-#if !defined PRIx32 || @PRI_MACROS_BROKEN@
+#if !defined PRIx32 || 0
 # undef PRIx32
 # ifdef UINT32_MAX
 #  define PRIx32 "x"
 # endif
 #endif
-#if !defined PRIX32 || @PRI_MACROS_BROKEN@
+#if !defined PRIX32 || 0
 # undef PRIX32
 # ifdef UINT32_MAX
 #  define PRIX32 "X"
 # endif
 #endif
 #ifdef INT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+# if (0 ? defined _LP64 : 1)
 #  define _PRI64_PREFIX "l"
 # elif defined _MSC_VER || defined __MINGW32__
 #  define _PRI64_PREFIX "I64"
-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# elif 1 && LONG_MAX >> 30 == 1
 #  define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
 # endif
-# if !defined PRId64 || @PRI_MACROS_BROKEN@
+# if !defined PRId64 || 0
 #  undef PRId64
 #  define PRId64 _PRI64_PREFIX "d"
 # endif
-# if !defined PRIi64 || @PRI_MACROS_BROKEN@
+# if !defined PRIi64 || 0
 #  undef PRIi64
 #  define PRIi64 _PRI64_PREFIX "i"
 # endif
 #endif
 #ifdef UINT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+# if (0 ? defined _LP64 : 1)
 #  define _PRIu64_PREFIX "l"
 # elif defined _MSC_VER || defined __MINGW32__
 #  define _PRIu64_PREFIX "I64"
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# elif 1 && ULONG_MAX >> 31 == 1
 #  define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
 # endif
-# if !defined PRIo64 || @PRI_MACROS_BROKEN@
+# if !defined PRIo64 || 0
 #  undef PRIo64
 #  define PRIo64 _PRIu64_PREFIX "o"
 # endif
-# if !defined PRIu64 || @PRI_MACROS_BROKEN@
+# if !defined PRIu64 || 0
 #  undef PRIu64
 #  define PRIu64 _PRIu64_PREFIX "u"
 # endif
-# if !defined PRIx64 || @PRI_MACROS_BROKEN@
+# if !defined PRIx64 || 0
 #  undef PRIx64
 #  define PRIx64 _PRIu64_PREFIX "x"
 # endif
-# if !defined PRIX64 || @PRI_MACROS_BROKEN@
+# if !defined PRIX64 || 0
 #  undef PRIX64
 #  define PRIX64 _PRIu64_PREFIX "X"
 # endif
 #endif
 
-#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIdLEAST8 || 0
 # undef PRIdLEAST8
 # define PRIdLEAST8 "d"
 #endif
-#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIiLEAST8 || 0
 # undef PRIiLEAST8
 # define PRIiLEAST8 "i"
 #endif
-#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIoLEAST8 || 0
 # undef PRIoLEAST8
 # define PRIoLEAST8 "o"
 #endif
-#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIuLEAST8 || 0
 # undef PRIuLEAST8
 # define PRIuLEAST8 "u"
 #endif
-#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIxLEAST8 || 0
 # undef PRIxLEAST8
 # define PRIxLEAST8 "x"
 #endif
-#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIXLEAST8 || 0
 # undef PRIXLEAST8
 # define PRIXLEAST8 "X"
 #endif
-#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIdLEAST16 || 0
 # undef PRIdLEAST16
 # define PRIdLEAST16 "d"
 #endif
-#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIiLEAST16 || 0
 # undef PRIiLEAST16
 # define PRIiLEAST16 "i"
 #endif
-#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIoLEAST16 || 0
 # undef PRIoLEAST16
 # define PRIoLEAST16 "o"
 #endif
-#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIuLEAST16 || 0
 # undef PRIuLEAST16
 # define PRIuLEAST16 "u"
 #endif
-#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIxLEAST16 || 0
 # undef PRIxLEAST16
 # define PRIxLEAST16 "x"
 #endif
-#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIXLEAST16 || 0
 # undef PRIXLEAST16
 # define PRIXLEAST16 "X"
 #endif
-#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIdLEAST32 || 0
 # undef PRIdLEAST32
 # define PRIdLEAST32 "d"
 #endif
-#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIiLEAST32 || 0
 # undef PRIiLEAST32
 # define PRIiLEAST32 "i"
 #endif
-#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIoLEAST32 || 0
 # undef PRIoLEAST32
 # define PRIoLEAST32 "o"
 #endif
-#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIuLEAST32 || 0
 # undef PRIuLEAST32
 # define PRIuLEAST32 "u"
 #endif
-#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIxLEAST32 || 0
 # undef PRIxLEAST32
 # define PRIxLEAST32 "x"
 #endif
-#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIXLEAST32 || 0
 # undef PRIXLEAST32
 # define PRIXLEAST32 "X"
 #endif
 #ifdef INT64_MAX
-# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIdLEAST64 || 0
 #  undef PRIdLEAST64
 #  define PRIdLEAST64 PRId64
 # endif
-# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIiLEAST64 || 0
 #  undef PRIiLEAST64
 #  define PRIiLEAST64 PRIi64
 # endif
 #endif
 #ifdef UINT64_MAX
-# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIoLEAST64 || 0
 #  undef PRIoLEAST64
 #  define PRIoLEAST64 PRIo64
 # endif
-# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIuLEAST64 || 0
 #  undef PRIuLEAST64
 #  define PRIuLEAST64 PRIu64
 # endif
-# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIxLEAST64 || 0
 #  undef PRIxLEAST64
 #  define PRIxLEAST64 PRIx64
 # endif
-# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIXLEAST64 || 0
 #  undef PRIXLEAST64
 #  define PRIXLEAST64 PRIX64
 # endif
 #endif
 
-#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIdFAST8 || 0
 # undef PRIdFAST8
 # if INT_FAST8_MAX > INT32_MAX
 #  define PRIdFAST8 PRId64
@@ -332,7 +644,7 @@
 #  define PRIdFAST8 "d"
 # endif
 #endif
-#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIiFAST8 || 0
 # undef PRIiFAST8
 # if INT_FAST8_MAX > INT32_MAX
 #  define PRIiFAST8 PRIi64
@@ -340,7 +652,7 @@
 #  define PRIiFAST8 "i"
 # endif
 #endif
-#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIoFAST8 || 0
 # undef PRIoFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define PRIoFAST8 PRIo64
@@ -348,7 +660,7 @@
 #  define PRIoFAST8 "o"
 # endif
 #endif
-#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIuFAST8 || 0
 # undef PRIuFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define PRIuFAST8 PRIu64
@@ -356,7 +668,7 @@
 #  define PRIuFAST8 "u"
 # endif
 #endif
-#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIxFAST8 || 0
 # undef PRIxFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define PRIxFAST8 PRIx64
@@ -364,7 +676,7 @@
 #  define PRIxFAST8 "x"
 # endif
 #endif
-#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
+#if !defined PRIXFAST8 || 0
 # undef PRIXFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define PRIXFAST8 PRIX64
@@ -372,7 +684,7 @@
 #  define PRIXFAST8 "X"
 # endif
 #endif
-#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIdFAST16 || 0
 # undef PRIdFAST16
 # if INT_FAST16_MAX > INT32_MAX
 #  define PRIdFAST16 PRId64
@@ -380,7 +692,7 @@
 #  define PRIdFAST16 "d"
 # endif
 #endif
-#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIiFAST16 || 0
 # undef PRIiFAST16
 # if INT_FAST16_MAX > INT32_MAX
 #  define PRIiFAST16 PRIi64
@@ -388,7 +700,7 @@
 #  define PRIiFAST16 "i"
 # endif
 #endif
-#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIoFAST16 || 0
 # undef PRIoFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define PRIoFAST16 PRIo64
@@ -396,7 +708,7 @@
 #  define PRIoFAST16 "o"
 # endif
 #endif
-#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIuFAST16 || 0
 # undef PRIuFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define PRIuFAST16 PRIu64
@@ -404,7 +716,7 @@
 #  define PRIuFAST16 "u"
 # endif
 #endif
-#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIxFAST16 || 0
 # undef PRIxFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define PRIxFAST16 PRIx64
@@ -412,7 +724,7 @@
 #  define PRIxFAST16 "x"
 # endif
 #endif
-#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
+#if !defined PRIXFAST16 || 0
 # undef PRIXFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define PRIXFAST16 PRIX64
@@ -420,7 +732,7 @@
 #  define PRIXFAST16 "X"
 # endif
 #endif
-#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIdFAST32 || 0
 # undef PRIdFAST32
 # if INT_FAST32_MAX > INT32_MAX
 #  define PRIdFAST32 PRId64
@@ -428,7 +740,7 @@
 #  define PRIdFAST32 "d"
 # endif
 #endif
-#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIiFAST32 || 0
 # undef PRIiFAST32
 # if INT_FAST32_MAX > INT32_MAX
 #  define PRIiFAST32 PRIi64
@@ -436,7 +748,7 @@
 #  define PRIiFAST32 "i"
 # endif
 #endif
-#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIoFAST32 || 0
 # undef PRIoFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define PRIoFAST32 PRIo64
@@ -444,7 +756,7 @@
 #  define PRIoFAST32 "o"
 # endif
 #endif
-#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIuFAST32 || 0
 # undef PRIuFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define PRIuFAST32 PRIu64
@@ -452,7 +764,7 @@
 #  define PRIuFAST32 "u"
 # endif
 #endif
-#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIxFAST32 || 0
 # undef PRIxFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define PRIxFAST32 PRIx64
@@ -460,7 +772,7 @@
 #  define PRIxFAST32 "x"
 # endif
 #endif
-#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
+#if !defined PRIXFAST32 || 0
 # undef PRIXFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define PRIXFAST32 PRIX64
@@ -469,335 +781,335 @@
 # endif
 #endif
 #ifdef INT64_MAX
-# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIdFAST64 || 0
 #  undef PRIdFAST64
 #  define PRIdFAST64 PRId64
 # endif
-# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIiFAST64 || 0
 #  undef PRIiFAST64
 #  define PRIiFAST64 PRIi64
 # endif
 #endif
 #ifdef UINT64_MAX
-# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIoFAST64 || 0
 #  undef PRIoFAST64
 #  define PRIoFAST64 PRIo64
 # endif
-# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIuFAST64 || 0
 #  undef PRIuFAST64
 #  define PRIuFAST64 PRIu64
 # endif
-# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIxFAST64 || 0
 #  undef PRIxFAST64
 #  define PRIxFAST64 PRIx64
 # endif
-# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
+# if !defined PRIXFAST64 || 0
 #  undef PRIXFAST64
 #  define PRIXFAST64 PRIX64
 # endif
 #endif
 
-#if !defined PRIdMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIdMAX || 0
 # undef PRIdMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
+# if 1
 #  define PRIdMAX PRId64
 # else
 #  define PRIdMAX "ld"
 # endif
 #endif
-#if !defined PRIiMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIiMAX || 0
 # undef PRIiMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
+# if 1
 #  define PRIiMAX PRIi64
 # else
 #  define PRIiMAX "li"
 # endif
 #endif
-#if !defined PRIoMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIoMAX || 0
 # undef PRIoMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define PRIoMAX PRIo64
 # else
 #  define PRIoMAX "lo"
 # endif
 #endif
-#if !defined PRIuMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIuMAX || 0
 # undef PRIuMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define PRIuMAX PRIu64
 # else
 #  define PRIuMAX "lu"
 # endif
 #endif
-#if !defined PRIxMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIxMAX || 0
 # undef PRIxMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define PRIxMAX PRIx64
 # else
 #  define PRIxMAX "lx"
 # endif
 #endif
-#if !defined PRIXMAX || @PRI_MACROS_BROKEN@
+#if !defined PRIXMAX || 0
 # undef PRIXMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define PRIXMAX PRIX64
 # else
 #  define PRIXMAX "lX"
 # endif
 #endif
 
-#if !defined PRIdPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIdPTR || 0
 # undef PRIdPTR
 # ifdef INTPTR_MAX
-#  define PRIdPTR @PRIPTR_PREFIX@ "d"
+#  define PRIdPTR "l" "d"
 # endif
 #endif
-#if !defined PRIiPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIiPTR || 0
 # undef PRIiPTR
 # ifdef INTPTR_MAX
-#  define PRIiPTR @PRIPTR_PREFIX@ "i"
+#  define PRIiPTR "l" "i"
 # endif
 #endif
-#if !defined PRIoPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIoPTR || 0
 # undef PRIoPTR
 # ifdef UINTPTR_MAX
-#  define PRIoPTR @PRIPTR_PREFIX@ "o"
+#  define PRIoPTR "l" "o"
 # endif
 #endif
-#if !defined PRIuPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIuPTR || 0
 # undef PRIuPTR
 # ifdef UINTPTR_MAX
-#  define PRIuPTR @PRIPTR_PREFIX@ "u"
+#  define PRIuPTR "l" "u"
 # endif
 #endif
-#if !defined PRIxPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIxPTR || 0
 # undef PRIxPTR
 # ifdef UINTPTR_MAX
-#  define PRIxPTR @PRIPTR_PREFIX@ "x"
+#  define PRIxPTR "l" "x"
 # endif
 #endif
-#if !defined PRIXPTR || @PRI_MACROS_BROKEN@
+#if !defined PRIXPTR || 0
 # undef PRIXPTR
 # ifdef UINTPTR_MAX
-#  define PRIXPTR @PRIPTR_PREFIX@ "X"
+#  define PRIXPTR "l" "X"
 # endif
 #endif
 
-#if !defined SCNd8 || @PRI_MACROS_BROKEN@
+#if !defined SCNd8 || 0
 # undef SCNd8
 # ifdef INT8_MAX
 #  define SCNd8 "hhd"
 # endif
 #endif
-#if !defined SCNi8 || @PRI_MACROS_BROKEN@
+#if !defined SCNi8 || 0
 # undef SCNi8
 # ifdef INT8_MAX
 #  define SCNi8 "hhi"
 # endif
 #endif
-#if !defined SCNo8 || @PRI_MACROS_BROKEN@
+#if !defined SCNo8 || 0
 # undef SCNo8
 # ifdef UINT8_MAX
 #  define SCNo8 "hho"
 # endif
 #endif
-#if !defined SCNu8 || @PRI_MACROS_BROKEN@
+#if !defined SCNu8 || 0
 # undef SCNu8
 # ifdef UINT8_MAX
 #  define SCNu8 "hhu"
 # endif
 #endif
-#if !defined SCNx8 || @PRI_MACROS_BROKEN@
+#if !defined SCNx8 || 0
 # undef SCNx8
 # ifdef UINT8_MAX
 #  define SCNx8 "hhx"
 # endif
 #endif
-#if !defined SCNd16 || @PRI_MACROS_BROKEN@
+#if !defined SCNd16 || 0
 # undef SCNd16
 # ifdef INT16_MAX
 #  define SCNd16 "hd"
 # endif
 #endif
-#if !defined SCNi16 || @PRI_MACROS_BROKEN@
+#if !defined SCNi16 || 0
 # undef SCNi16
 # ifdef INT16_MAX
 #  define SCNi16 "hi"
 # endif
 #endif
-#if !defined SCNo16 || @PRI_MACROS_BROKEN@
+#if !defined SCNo16 || 0
 # undef SCNo16
 # ifdef UINT16_MAX
 #  define SCNo16 "ho"
 # endif
 #endif
-#if !defined SCNu16 || @PRI_MACROS_BROKEN@
+#if !defined SCNu16 || 0
 # undef SCNu16
 # ifdef UINT16_MAX
 #  define SCNu16 "hu"
 # endif
 #endif
-#if !defined SCNx16 || @PRI_MACROS_BROKEN@
+#if !defined SCNx16 || 0
 # undef SCNx16
 # ifdef UINT16_MAX
 #  define SCNx16 "hx"
 # endif
 #endif
-#if !defined SCNd32 || @PRI_MACROS_BROKEN@
+#if !defined SCNd32 || 0
 # undef SCNd32
 # ifdef INT32_MAX
 #  define SCNd32 "d"
 # endif
 #endif
-#if !defined SCNi32 || @PRI_MACROS_BROKEN@
+#if !defined SCNi32 || 0
 # undef SCNi32
 # ifdef INT32_MAX
 #  define SCNi32 "i"
 # endif
 #endif
-#if !defined SCNo32 || @PRI_MACROS_BROKEN@
+#if !defined SCNo32 || 0
 # undef SCNo32
 # ifdef UINT32_MAX
 #  define SCNo32 "o"
 # endif
 #endif
-#if !defined SCNu32 || @PRI_MACROS_BROKEN@
+#if !defined SCNu32 || 0
 # undef SCNu32
 # ifdef UINT32_MAX
 #  define SCNu32 "u"
 # endif
 #endif
-#if !defined SCNx32 || @PRI_MACROS_BROKEN@
+#if !defined SCNx32 || 0
 # undef SCNx32
 # ifdef UINT32_MAX
 #  define SCNx32 "x"
 # endif
 #endif
 #ifdef INT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+# if (0 ? defined _LP64 : 1)
 #  define _SCN64_PREFIX "l"
 # elif defined _MSC_VER || defined __MINGW32__
 #  define _SCN64_PREFIX "I64"
-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# elif 1 && LONG_MAX >> 30 == 1
 #  define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
 # endif
-# if !defined SCNd64 || @PRI_MACROS_BROKEN@
+# if !defined SCNd64 || 0
 #  undef SCNd64
 #  define SCNd64 _SCN64_PREFIX "d"
 # endif
-# if !defined SCNi64 || @PRI_MACROS_BROKEN@
+# if !defined SCNi64 || 0
 #  undef SCNi64
 #  define SCNi64 _SCN64_PREFIX "i"
 # endif
 #endif
 #ifdef UINT64_MAX
-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+# if (0 ? defined _LP64 : 1)
 #  define _SCNu64_PREFIX "l"
 # elif defined _MSC_VER || defined __MINGW32__
 #  define _SCNu64_PREFIX "I64"
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+# elif 1 && ULONG_MAX >> 31 == 1
 #  define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
 # endif
-# if !defined SCNo64 || @PRI_MACROS_BROKEN@
+# if !defined SCNo64 || 0
 #  undef SCNo64
 #  define SCNo64 _SCNu64_PREFIX "o"
 # endif
-# if !defined SCNu64 || @PRI_MACROS_BROKEN@
+# if !defined SCNu64 || 0
 #  undef SCNu64
 #  define SCNu64 _SCNu64_PREFIX "u"
 # endif
-# if !defined SCNx64 || @PRI_MACROS_BROKEN@
+# if !defined SCNx64 || 0
 #  undef SCNx64
 #  define SCNx64 _SCNu64_PREFIX "x"
 # endif
 #endif
 
-#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNdLEAST8 || 0
 # undef SCNdLEAST8
 # define SCNdLEAST8 "hhd"
 #endif
-#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNiLEAST8 || 0
 # undef SCNiLEAST8
 # define SCNiLEAST8 "hhi"
 #endif
-#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNoLEAST8 || 0
 # undef SCNoLEAST8
 # define SCNoLEAST8 "hho"
 #endif
-#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNuLEAST8 || 0
 # undef SCNuLEAST8
 # define SCNuLEAST8 "hhu"
 #endif
-#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNxLEAST8 || 0
 # undef SCNxLEAST8
 # define SCNxLEAST8 "hhx"
 #endif
-#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNdLEAST16 || 0
 # undef SCNdLEAST16
 # define SCNdLEAST16 "hd"
 #endif
-#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNiLEAST16 || 0
 # undef SCNiLEAST16
 # define SCNiLEAST16 "hi"
 #endif
-#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNoLEAST16 || 0
 # undef SCNoLEAST16
 # define SCNoLEAST16 "ho"
 #endif
-#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNuLEAST16 || 0
 # undef SCNuLEAST16
 # define SCNuLEAST16 "hu"
 #endif
-#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNxLEAST16 || 0
 # undef SCNxLEAST16
 # define SCNxLEAST16 "hx"
 #endif
-#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNdLEAST32 || 0
 # undef SCNdLEAST32
 # define SCNdLEAST32 "d"
 #endif
-#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNiLEAST32 || 0
 # undef SCNiLEAST32
 # define SCNiLEAST32 "i"
 #endif
-#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNoLEAST32 || 0
 # undef SCNoLEAST32
 # define SCNoLEAST32 "o"
 #endif
-#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNuLEAST32 || 0
 # undef SCNuLEAST32
 # define SCNuLEAST32 "u"
 #endif
-#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNxLEAST32 || 0
 # undef SCNxLEAST32
 # define SCNxLEAST32 "x"
 #endif
 #ifdef INT64_MAX
-# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNdLEAST64 || 0
 #  undef SCNdLEAST64
 #  define SCNdLEAST64 SCNd64
 # endif
-# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNiLEAST64 || 0
 #  undef SCNiLEAST64
 #  define SCNiLEAST64 SCNi64
 # endif
 #endif
 #ifdef UINT64_MAX
-# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNoLEAST64 || 0
 #  undef SCNoLEAST64
 #  define SCNoLEAST64 SCNo64
 # endif
-# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNuLEAST64 || 0
 #  undef SCNuLEAST64
 #  define SCNuLEAST64 SCNu64
 # endif
-# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNxLEAST64 || 0
 #  undef SCNxLEAST64
 #  define SCNxLEAST64 SCNx64
 # endif
 #endif
 
-#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNdFAST8 || 0
 # undef SCNdFAST8
 # if INT_FAST8_MAX > INT32_MAX
 #  define SCNdFAST8 SCNd64
@@ -809,7 +1121,7 @@
 #  define SCNdFAST8 "d"
 # endif
 #endif
-#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNiFAST8 || 0
 # undef SCNiFAST8
 # if INT_FAST8_MAX > INT32_MAX
 #  define SCNiFAST8 SCNi64
@@ -821,7 +1133,7 @@
 #  define SCNiFAST8 "i"
 # endif
 #endif
-#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNoFAST8 || 0
 # undef SCNoFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define SCNoFAST8 SCNo64
@@ -833,7 +1145,7 @@
 #  define SCNoFAST8 "o"
 # endif
 #endif
-#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNuFAST8 || 0
 # undef SCNuFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define SCNuFAST8 SCNu64
@@ -845,7 +1157,7 @@
 #  define SCNuFAST8 "u"
 # endif
 #endif
-#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
+#if !defined SCNxFAST8 || 0
 # undef SCNxFAST8
 # if UINT_FAST8_MAX > UINT32_MAX
 #  define SCNxFAST8 SCNx64
@@ -857,7 +1169,7 @@
 #  define SCNxFAST8 "x"
 # endif
 #endif
-#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNdFAST16 || 0
 # undef SCNdFAST16
 # if INT_FAST16_MAX > INT32_MAX
 #  define SCNdFAST16 SCNd64
@@ -867,7 +1179,7 @@
 #  define SCNdFAST16 "d"
 # endif
 #endif
-#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNiFAST16 || 0
 # undef SCNiFAST16
 # if INT_FAST16_MAX > INT32_MAX
 #  define SCNiFAST16 SCNi64
@@ -877,7 +1189,7 @@
 #  define SCNiFAST16 "i"
 # endif
 #endif
-#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNoFAST16 || 0
 # undef SCNoFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define SCNoFAST16 SCNo64
@@ -887,7 +1199,7 @@
 #  define SCNoFAST16 "o"
 # endif
 #endif
-#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNuFAST16 || 0
 # undef SCNuFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define SCNuFAST16 SCNu64
@@ -897,7 +1209,7 @@
 #  define SCNuFAST16 "u"
 # endif
 #endif
-#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
+#if !defined SCNxFAST16 || 0
 # undef SCNxFAST16
 # if UINT_FAST16_MAX > UINT32_MAX
 #  define SCNxFAST16 SCNx64
@@ -907,7 +1219,7 @@
 #  define SCNxFAST16 "x"
 # endif
 #endif
-#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNdFAST32 || 0
 # undef SCNdFAST32
 # if INT_FAST32_MAX > INT32_MAX
 #  define SCNdFAST32 SCNd64
@@ -915,7 +1227,7 @@
 #  define SCNdFAST32 "d"
 # endif
 #endif
-#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNiFAST32 || 0
 # undef SCNiFAST32
 # if INT_FAST32_MAX > INT32_MAX
 #  define SCNiFAST32 SCNi64
@@ -923,7 +1235,7 @@
 #  define SCNiFAST32 "i"
 # endif
 #endif
-#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNoFAST32 || 0
 # undef SCNoFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define SCNoFAST32 SCNo64
@@ -931,7 +1243,7 @@
 #  define SCNoFAST32 "o"
 # endif
 #endif
-#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNuFAST32 || 0
 # undef SCNuFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define SCNuFAST32 SCNu64
@@ -939,7 +1251,7 @@
 #  define SCNuFAST32 "u"
 # endif
 #endif
-#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
+#if !defined SCNxFAST32 || 0
 # undef SCNxFAST32
 # if UINT_FAST32_MAX > UINT32_MAX
 #  define SCNxFAST32 SCNx64
@@ -948,99 +1260,99 @@
 # endif
 #endif
 #ifdef INT64_MAX
-# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNdFAST64 || 0
 #  undef SCNdFAST64
 #  define SCNdFAST64 SCNd64
 # endif
-# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNiFAST64 || 0
 #  undef SCNiFAST64
 #  define SCNiFAST64 SCNi64
 # endif
 #endif
 #ifdef UINT64_MAX
-# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNoFAST64 || 0
 #  undef SCNoFAST64
 #  define SCNoFAST64 SCNo64
 # endif
-# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNuFAST64 || 0
 #  undef SCNuFAST64
 #  define SCNuFAST64 SCNu64
 # endif
-# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
+# if !defined SCNxFAST64 || 0
 #  undef SCNxFAST64
 #  define SCNxFAST64 SCNx64
 # endif
 #endif
 
-#if !defined SCNdMAX || @PRI_MACROS_BROKEN@
+#if !defined SCNdMAX || 0
 # undef SCNdMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
+# if 1
 #  define SCNdMAX SCNd64
 # else
 #  define SCNdMAX "ld"
 # endif
 #endif
-#if !defined SCNiMAX || @PRI_MACROS_BROKEN@
+#if !defined SCNiMAX || 0
 # undef SCNiMAX
-# if @INT32_MAX_LT_INTMAX_MAX@
+# if 1
 #  define SCNiMAX SCNi64
 # else
 #  define SCNiMAX "li"
 # endif
 #endif
-#if !defined SCNoMAX || @PRI_MACROS_BROKEN@
+#if !defined SCNoMAX || 0
 # undef SCNoMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define SCNoMAX SCNo64
 # else
 #  define SCNoMAX "lo"
 # endif
 #endif
-#if !defined SCNuMAX || @PRI_MACROS_BROKEN@
+#if !defined SCNuMAX || 0
 # undef SCNuMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define SCNuMAX SCNu64
 # else
 #  define SCNuMAX "lu"
 # endif
 #endif
-#if !defined SCNxMAX || @PRI_MACROS_BROKEN@
+#if !defined SCNxMAX || 0
 # undef SCNxMAX
-# if @UINT32_MAX_LT_UINTMAX_MAX@
+# if 1
 #  define SCNxMAX SCNx64
 # else
 #  define SCNxMAX "lx"
 # endif
 #endif
 
-#if !defined SCNdPTR || @PRI_MACROS_BROKEN@
+#if !defined SCNdPTR || 0
 # undef SCNdPTR
 # ifdef INTPTR_MAX
-#  define SCNdPTR @PRIPTR_PREFIX@ "d"
+#  define SCNdPTR "l" "d"
 # endif
 #endif
-#if !defined SCNiPTR || @PRI_MACROS_BROKEN@
+#if !defined SCNiPTR || 0
 # undef SCNiPTR
 # ifdef INTPTR_MAX
-#  define SCNiPTR @PRIPTR_PREFIX@ "i"
+#  define SCNiPTR "l" "i"
 # endif
 #endif
-#if !defined SCNoPTR || @PRI_MACROS_BROKEN@
+#if !defined SCNoPTR || 0
 # undef SCNoPTR
 # ifdef UINTPTR_MAX
-#  define SCNoPTR @PRIPTR_PREFIX@ "o"
+#  define SCNoPTR "l" "o"
 # endif
 #endif
-#if !defined SCNuPTR || @PRI_MACROS_BROKEN@
+#if !defined SCNuPTR || 0
 # undef SCNuPTR
 # ifdef UINTPTR_MAX
-#  define SCNuPTR @PRIPTR_PREFIX@ "u"
+#  define SCNuPTR "l" "u"
 # endif
 #endif
-#if !defined SCNxPTR || @PRI_MACROS_BROKEN@
+#if !defined SCNxPTR || 0
 # undef SCNxPTR
 # ifdef UINTPTR_MAX
-#  define SCNxPTR @PRIPTR_PREFIX@ "x"
+#  define SCNxPTR "l" "x"
 # endif
 #endif
 
@@ -1050,8 +1362,8 @@
 extern "C" {
 #endif
 
-#if @GNULIB_IMAXABS@
-# if !@HAVE_DECL_IMAXABS@
+#if 1
+# if !0
 extern intmax_t imaxabs (intmax_t);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1062,8 +1374,8 @@
 # endif
 #endif
 
-#if @GNULIB_IMAXDIV@
-# if !@HAVE_DECL_IMAXDIV@
+#if 1
+# if !0
 #  if !GNULIB_defined_imaxdiv_t
 typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
 #   define GNULIB_defined_imaxdiv_t 1
@@ -1078,8 +1390,8 @@
 # endif
 #endif
 
-#if @GNULIB_STRTOIMAX@
-# if @REPLACE_STRTOIMAX@
+#if 1
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef strtoimax
 #   define strtoimax rpl_strtoimax
@@ -1088,7 +1400,7 @@
                   (const char *, char **, int) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int));
 # else
-#  if !@HAVE_DECL_STRTOIMAX@
+#  if !1
 #   undef strtoimax
 _GL_FUNCDECL_SYS (strtoimax, intmax_t,
                   (const char *, char **, int) _GL_ARG_NONNULL ((1)));
@@ -1104,8 +1416,8 @@
 # endif
 #endif
 
-#if @GNULIB_STRTOUMAX@
-# if !@HAVE_DECL_STRTOUMAX@
+#if 1
+# if !1
 #  undef strtoumax
 _GL_FUNCDECL_SYS (strtoumax, uintmax_t,
                   (const char *, char **, int) _GL_ARG_NONNULL ((1)));

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09  7:29       ` Daniel Richard G.
@ 2013-10-09 15:06         ` Paul Eggert
  2013-10-09 18:42           ` Daniel Richard G.
  2013-10-10 15:52           ` Tom G. Christensen
  0 siblings, 2 replies; 16+ messages in thread
From: Paul Eggert @ 2013-10-09 15:06 UTC (permalink / raw
  To: Daniel Richard G., bug-gnulib

Thanks, apparently this problem has been around for a while; see
<http://lists.gnu.org/archive/html/bug-bash/2005-09/msg00022.html>.

I pushed the following patch, which I hope fixes things for you.
It'll be a bit more of a pain to merge this into bash etc.,
but you can test it separately by grabbing a copy of the latest
gnulib via 'git clone git://git.savannah.gnu.org/gnulib.git'
and then running the command:

./gnulib-tool --test strtoimax strtoumax

I've done that on Fedora 19 but don't have a HP-UX 11.11 host
to try it out on.

>From 42d263937a411dfc4685aa3384d34b9888daeb06 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Oct 2013 08:05:24 -0700
Subject: [PATCH] strtoimax, strtoumax: port to HP-UX 11.11

Problem reported by Daniel Richard G. in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-10/msg00023.html>.
* lib/inttypes.in.h (strtoumax): Replace strtoumax if
REPLACE_STRTOUMAX, thus treating it consistently with strtoimax.
* m4/inttypes.m4 (gl_INTTYPES_H_DEFAULTS): Add default for
REPLACE_STRTOUMAX.
* m4/strtoimax.m4 (gl_FUNC_STRTOIMAX):
* m4/strtoumax.m4 (gl_FUNC_STRTOUMAX):
Replace the function if defined as a macro but not as a function.
* modules/inttypes-incomplete (inttypes.h): Substitute
REPLACE_STRTOUMAX.
* modules/strtoumax (configure.ac): Replace strtoumax if
REPLACE_STRTOUMAX.
---
 ChangeLog                   | 17 +++++++++++++++++
 lib/inttypes.in.h           | 16 +++++++++++++---
 m4/inttypes.m4              |  1 +
 m4/strtoimax.m4             |  8 ++++++--
 m4/strtoumax.m4             |  9 +++++++--
 modules/inttypes-incomplete |  1 +
 modules/strtoumax           |  2 +-
 7 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d3cb6c..b176e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013-10-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	strtoimax, strtoumax: port to HP-UX 11.11
+	Problem reported by Daniel Richard G. in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-10/msg00023.html>.
+	* lib/inttypes.in.h (strtoumax): Replace strtoumax if
+	REPLACE_STRTOUMAX, thus treating it consistently with strtoimax.
+	* m4/inttypes.m4 (gl_INTTYPES_H_DEFAULTS): Add default for
+	REPLACE_STRTOUMAX.
+	* m4/strtoimax.m4 (gl_FUNC_STRTOIMAX):
+	* m4/strtoumax.m4 (gl_FUNC_STRTOUMAX):
+	Replace the function if defined as a macro but not as a function.
+	* modules/inttypes-incomplete (inttypes.h): Substitute
+	REPLACE_STRTOUMAX.
+	* modules/strtoumax (configure.ac): Replace strtoumax if
+	REPLACE_STRTOUMAX.
+
 2013-10-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	strtoimax: port to HP-UX 11.11
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 1893f55..05a22ff 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -1105,12 +1105,22 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 #endif
 
 #if @GNULIB_STRTOUMAX@
-# if !@HAVE_DECL_STRTOUMAX@
-#  undef strtoumax
+# if @REPLACE_STRTOUMAX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strtoumax
+#   define strtoumax rpl_strtoumax
+#  endif
+_GL_FUNCDECL_RPL (strtoumax, uintmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int));
+# else
+#  if !@HAVE_DECL_STRTOUMAX@
+#   undef strtoumax
 _GL_FUNCDECL_SYS (strtoumax, uintmax_t,
                   (const char *, char **, int) _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int));
+# endif
 _GL_CXXALIASWARN (strtoumax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoumax
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 3b483d3..b06c777 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -148,6 +148,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
   HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
   HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
   REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
+  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
   INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
   INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
   PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index bee93b2..20454dc 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 13
+# strtoimax.m4 serial 14
 dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
     HAVE_DECL_STRTOIMAX=0
   fi
 
-  if test $ac_cv_func_strtoimax = yes; then
+  if test "$ac_cv_func_strtoimax" = yes; then
     HAVE_STRTOIMAX=1
     dnl On AIX 5.1, strtoimax() fails for values outside the 'int' range.
     AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
@@ -72,6 +72,10 @@ int main ()
       *no) REPLACE_STRTOIMAX=1 ;;
     esac
   else
+    if test "$ac_cv_have_decl_strtoimax" = yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOIMAX=1
+    fi
     HAVE_STRTOIMAX=0
   fi
 ])
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 6a6aeb5..9c8ff17 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,4 +1,4 @@
-# strtoumax.m4 serial 11
+# strtoumax.m4 serial 12
 dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,12 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
   dnl On OSF/1 5.1 with cc, this function is declared but not defined.
   AC_CHECK_FUNCS_ONCE([strtoumax])
   AC_CHECK_DECLS_ONCE([strtoumax])
-  if test "$ac_cv_have_decl_strtoumax" != yes; then
+  if test "$ac_cv_have_decl_strtoumax" = yes; then
+    if test "$ac_cv_func_strtoumax" != yes; then
+      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
+      REPLACE_STRTOUMAX=1
+    fi
+  else
     HAVE_DECL_STRTOUMAX=0
   fi
 ])
diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete
index 5943dae..8c29a29 100644
--- a/modules/inttypes-incomplete
+++ b/modules/inttypes-incomplete
@@ -43,6 +43,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
 	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
+	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
diff --git a/modules/strtoumax b/modules/strtoumax
index dc72a0a..1d2a15a 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -15,7 +15,7 @@ strtoull        [test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_lo
 
 configure.ac:
 gl_FUNC_STRTOUMAX
-if test $ac_cv_func_strtoumax = no; then
+if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
   AC_LIBOBJ([strtoumax])
   gl_PREREQ_STRTOUMAX
 fi
-- 
1.8.3.1




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09 15:06         ` Paul Eggert
@ 2013-10-09 18:42           ` Daniel Richard G.
  2013-10-09 18:44             ` Paul Eggert
  2013-10-10 15:52           ` Tom G. Christensen
  1 sibling, 1 reply; 16+ messages in thread
From: Daniel Richard G. @ 2013-10-09 18:42 UTC (permalink / raw
  To: Paul Eggert, bug-gnulib

On Wed, 2013 Oct  9 8:06-0700, Paul Eggert wrote:
> Thanks, apparently this problem has been around for a while; see
> <http://lists.gnu.org/archive/html/bug-bash/2005-09/msg00022.html>.

I'd come across that same message too. Odd that this issue wasn't
fixed long ago!

> I pushed the following patch, which I hope fixes things for you. It'll
> be a bit more of a pain to merge this into bash etc., but you can test
> it separately by grabbing a copy of the latest gnulib via 'git clone
> git://git.savannah.gnu.org/gnulib.git' and then running the command:
>
> ./gnulib-tool --test strtoimax strtoumax
>
> I've done that on Fedora 19 but don't have a HP-UX 11.11 host to try
> it out on.

Yep, that did the trick! I now get an error-free test build on HP-UX. (A
number of unrelated "make check" test programs are failing, however;
I'll send in a separate report for those.)

As for Bash et al., the two #undefs I posted originally are enough to
get the build going again. No big deal there.

On a different note: Is the gnulib autobuild still a thing? I see lots
of references online to Simon Josefsson's
http://autobuild.josefsson.org/gnulib/ site, but that now returns 404
(even though the top-level is still there).


--Daniel


-- 
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09 18:42           ` Daniel Richard G.
@ 2013-10-09 18:44             ` Paul Eggert
  2013-10-10 23:29               ` Daniel Richard G.
  0 siblings, 1 reply; 16+ messages in thread
From: Paul Eggert @ 2013-10-09 18:44 UTC (permalink / raw
  To: Daniel Richard G.; +Cc: bug-gnulib

On 10/09/13 11:42, Daniel Richard G. wrote:
> On a different note: Is the gnulib autobuild still a thing?


Sorry, I don't know.  Simon would know, I expect.


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09 15:06         ` Paul Eggert
  2013-10-09 18:42           ` Daniel Richard G.
@ 2013-10-10 15:52           ` Tom G. Christensen
  2013-10-10 16:18             ` Paul Eggert
  1 sibling, 1 reply; 16+ messages in thread
From: Tom G. Christensen @ 2013-10-10 15:52 UTC (permalink / raw
  To: Paul Eggert; +Cc: bug-gnulib

On 10/09/2013 05:06 PM, Paul Eggert wrote:
> I pushed the following patch, which I hope fixes things for you.
>
It broke my daily build on Solaris.

gcc -std=gnu99  -g -O2  -L/usr/tgcware/lib -R/usr/tgcware/lib -o 
test-xstrtoumax test-xstrtoumax.o ../gllib/libgnu.a 
/usr/tgcware/lib/libintl.so -R/usr/tgcware/lib -lm   -lm     -lm    -lm 
  -lm  -lm
Undefined			first referenced
  symbol  			    in file
strtoumax                           ../gllib/libgnu.a(xstrtoumax.o)
ld: fatal: Symbol referencing errors. No output written to test-xstrtoumax
collect2: error: ld returned 1 exit status
make[4]: *** [test-xstrtoumax] Error 1


> diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
> index 6a6aeb5..9c8ff17 100644
> --- a/m4/strtoumax.m4
> +++ b/m4/strtoumax.m4
> @@ -11,7 +11,12 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
>     dnl On OSF/1 5.1 with cc, this function is declared but not defined.
>     AC_CHECK_FUNCS_ONCE([strtoumax])
>     AC_CHECK_DECLS_ONCE([strtoumax])
> -  if test "$ac_cv_have_decl_strtoumax" != yes; then
> +  if test "$ac_cv_have_decl_strtoumax" = yes; then
> +    if test "$ac_cv_func_strtoumax" != yes; then
> +      # HP-UX 11.11 has "#define strtoimax(...) ..." but no function.
> +      REPLACE_STRTOUMAX=1
> +    fi
> +  else
>       HAVE_DECL_STRTOUMAX=0
>     fi
>   ])


This sets HAVE_DECL_STRTOUMAX=0 however...

> index dc72a0a..1d2a15a 100644
> --- a/modules/strtoumax
> +++ b/modules/strtoumax
> @@ -15,7 +15,7 @@ strtoull        [test $ac_cv_func_strtoumax = no&&  test $ac_cv_type_unsigned_lo
>
>   configure.ac:
>   gl_FUNC_STRTOUMAX
> -if test $ac_cv_func_strtoumax = no; then
> +if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
>     AC_LIBOBJ([strtoumax])
>     gl_PREREQ_STRTOUMAX
>   fi

This test checks HAVE_STRTOUMAX which is not declared anywhere.

Replacing HAVE_STRTOUMAX with HAVE_DECL_STRTOUMAX fixed the build.

-tgc


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 15:52           ` Tom G. Christensen
@ 2013-10-10 16:18             ` Paul Eggert
  2013-10-10 17:29               ` Tom G. Christensen
  0 siblings, 1 reply; 16+ messages in thread
From: Paul Eggert @ 2013-10-10 16:18 UTC (permalink / raw
  To: Tom G. Christensen; +Cc: bug-gnulib

On 10/10/13 08:52, Tom G. Christensen wrote:
> This test checks HAVE_STRTOUMAX which is not declared anywhere. 

It should be declared by  the AC_CHECK_FUNCS_ONCE([strtoumax])
in m4/strtoumax.m4.  But I think I see the problem; I forgot to copy
some of the stuff in modules/strtoimax into modules/strtoumax.
Thanks for reporting it.

I installed the following; does it fix things for you?
(I no longer have access to a Solaris 8 box; my oldest
Solaris antique is running Solaris 9.)

---
 ChangeLog         | 9 +++++++++
 modules/strtoumax | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b176e1d..3f6bf07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+    strtoumax: port to Solaris 8
+    This problem was introduced in the recent HP-UX patch.
+    Reported by Tom G. Christensen in
+    <http://lists.gnu.org/archive/html/bug-gnulib/2013-10/msg00037.html>.
+    * modules/strtoumax (Depends-on): Test HAVE_STRTOUMAX
+    and REPLACE_STRTOUMAX rather than ac_cv_func_strtoumax.
+
 2013-10-09  Paul Eggert  <eggert@cs.ucla.edu>
 
     strtoimax, strtoumax: port to HP-UX 11.11
diff --git a/modules/strtoumax b/modules/strtoumax
index 1d2a15a..ba6ec11 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -9,9 +9,9 @@ m4/strtoumax.m4
 
 Depends-on:
 inttypes-incomplete
-verify          [test $ac_cv_func_strtoumax = no]
-stdint          [test $ac_cv_func_strtoumax = no]
-strtoull        [test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes]
+verify          [test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+stdint          [test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
+strtoull        [{ test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
 
 configure.ac:
 gl_FUNC_STRTOUMAX
-- 
1.8.3.1




^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 16:18             ` Paul Eggert
@ 2013-10-10 17:29               ` Tom G. Christensen
  2013-10-10 18:24                 ` Eric Blake
  0 siblings, 1 reply; 16+ messages in thread
From: Tom G. Christensen @ 2013-10-10 17:29 UTC (permalink / raw
  To: Paul Eggert; +Cc: bug-gnulib

On 10/10/2013 06:18 PM, Paul Eggert wrote:
> On 10/10/13 08:52, Tom G. Christensen wrote:
> I installed the following; does it fix things for you?

No, the error is the same.

I see this in the configure output:
./configure: line 7680: test: =: unary operator expected

$ sed -n 7680p configure
   if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
	
Hence why I thought the problem was with HAVE_STRTOUMAX.

> (I no longer have access to a Solaris 8 box; my oldest
> Solaris antique is running Solaris 9.)
>
It's broken on Solaris 9 aswell.

The full logs from my daily builds are here:
http://jupiterrise.com/autobuild/gnulib/

-tgc


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 17:29               ` Tom G. Christensen
@ 2013-10-10 18:24                 ` Eric Blake
  2013-10-10 19:06                   ` Tom G. Christensen
  0 siblings, 1 reply; 16+ messages in thread
From: Eric Blake @ 2013-10-10 18:24 UTC (permalink / raw
  To: Tom G. Christensen, Paul Eggert; +Cc: bug-gnulib

[-- Attachment #1: Type: text/plain, Size: 2626 bytes --]

On 10/10/2013 11:29 AM, Tom G. Christensen wrote:
> On 10/10/2013 06:18 PM, Paul Eggert wrote:
>> On 10/10/13 08:52, Tom G. Christensen wrote:
>> I installed the following; does it fix things for you?
> 
> No, the error is the same.
> 
> I see this in the configure output:
> ./configure: line 7680: test: =: unary operator expected
> 
> $ sed -n 7680p configure
>   if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then

Oh, I see the typo; pushing this.

diff --git i/ChangeLog w/ChangeLog
index 3f6bf07..0d97328 100644
--- i/ChangeLog
+++ w/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-10  Eric Blake  <eblake@redhat.com>
+
+	strtoumax: fix typo in previous commit.
+	* modules/strtoumax (Depends-on): Fix typo.
+	* modules/strtoimax (Depends-on): Likewise.
+
 2013-10-10  Paul Eggert  <eggert@cs.ucla.edu>

 	strtoumax: port to Solaris 8
diff --git i/modules/strtoimax w/modules/strtoimax
index 2517603..5b0ea91 100644
--- i/modules/strtoimax
+++ w/modules/strtoimax
@@ -8,9 +8,9 @@ m4/longlong.m4

 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
-stdint          [test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1]
-strtoll         [{ test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX
= 1; } && test $ac_cv_type_long_long_int = yes]
+verify          [test $HAVE_DECL_STRTOIMAX = 0 || test
$REPLACE_STRTOIMAX = 1]
+stdint          [test $HAVE_DECL_STRTOIMAX = 0 || test
$REPLACE_STRTOIMAX = 1]
+strtoll         [{ test $HAVE_DECL_STRTOIMAX = 0 || test
$REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes]

 configure.ac:
 gl_FUNC_STRTOIMAX
diff --git i/modules/strtoumax w/modules/strtoumax
index ba6ec11..694184b 100644
--- i/modules/strtoumax
+++ w/modules/strtoumax
@@ -9,9 +9,9 @@ m4/strtoumax.m4

 Depends-on:
 inttypes-incomplete
-verify          [test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
-stdint          [test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1]
-strtoull        [{ test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX
= 1; } && test $ac_cv_type_unsigned_long_long_int = yes]
+verify          [test $HAVE_DECL_STRTOUMAX = 0 || test
$REPLACE_STRTOUMAX = 1]
+stdint          [test $HAVE_DECL_STRTOUMAX = 0 || test
$REPLACE_STRTOUMAX = 1]
+strtoull        [{ test $HAVE_DECL_STRTOUMAX = 0 || test
$REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes]

 configure.ac:
 gl_FUNC_STRTOUMAX


> 
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 18:24                 ` Eric Blake
@ 2013-10-10 19:06                   ` Tom G. Christensen
  2013-10-10 19:36                     ` Eric Blake
  0 siblings, 1 reply; 16+ messages in thread
From: Tom G. Christensen @ 2013-10-10 19:06 UTC (permalink / raw
  To: Eric Blake; +Cc: Paul Eggert, bug-gnulib

On 10/10/2013 08:24 PM, Eric Blake wrote:
> Oh, I see the typo; pushing this.
>
> diff --git i/ChangeLog w/ChangeLog
> index 3f6bf07..0d97328 100644
> --- i/ChangeLog
> +++ w/ChangeLog
> @@ -1,3 +1,9 @@
> +2013-10-10  Eric Blake<eblake@redhat.com>
> +
> +	strtoumax: fix typo in previous commit.
> +	* modules/strtoumax (Depends-on): Fix typo.
> +	* modules/strtoimax (Depends-on): Likewise.
> +

This did not fix the test error from configure.

Just creating a testdir on a CentOS 5 host and running configure results 
in the same error from test:
$ git describe
v0.0-8046-gfa1db0d
$ ./gnulib-tool --create-testdir --with-tests --dir=../strtoumax strtoumax
$ cd ../strtoumax
$ ./configure | grep unary
./configure: line 7680: test: =: unary operator expected
./configure: line 7674: test: =: unary operator expected
$ sed -n 7680p configure
   if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
$ sed -n 7674p gltests/configure
   if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then

-tgc



^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 19:06                   ` Tom G. Christensen
@ 2013-10-10 19:36                     ` Eric Blake
  2013-10-10 19:52                       ` Tom G. Christensen
  0 siblings, 1 reply; 16+ messages in thread
From: Eric Blake @ 2013-10-10 19:36 UTC (permalink / raw
  To: Tom G. Christensen; +Cc: Paul Eggert, bug-gnulib

[-- Attachment #1: Type: text/plain, Size: 865 bytes --]

On 10/10/2013 01:06 PM, Tom G. Christensen wrote:
> On 10/10/2013 08:24 PM, Eric Blake wrote:
>> Oh, I see the typo; pushing this.
>>

> 
> This did not fix the test error from configure.
> 
> Just creating a testdir on a CentOS 5 host and running configure results
> in the same error from test:
> $ git describe
> v0.0-8046-gfa1db0d
> $ ./gnulib-tool --create-testdir --with-tests --dir=../strtoumax strtoumax
> $ cd ../strtoumax
> $ ./configure | grep unary
> ./configure: line 7680: test: =: unary operator expected
> ./configure: line 7674: test: =: unary operator expected
> $ sed -n 7680p configure
>   if test $HAVE_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then

Blah, I missed some instances.  Obvious followup pushed.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-10 19:36                     ` Eric Blake
@ 2013-10-10 19:52                       ` Tom G. Christensen
  0 siblings, 0 replies; 16+ messages in thread
From: Tom G. Christensen @ 2013-10-10 19:52 UTC (permalink / raw
  To: Eric Blake; +Cc: Paul Eggert, bug-gnulib

On 10/10/2013 09:36 PM, Eric Blake wrote:
> Blah, I missed some instances.  Obvious followup pushed.
>
Thanks, it seems to be fine now and the build works on Solaris again.

-tgc


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11
  2013-10-09 18:44             ` Paul Eggert
@ 2013-10-10 23:29               ` Daniel Richard G.
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Richard G. @ 2013-10-10 23:29 UTC (permalink / raw
  To: Paul Eggert; +Cc: bug-gnulib

On Wed, 2013 Oct  9 11:44-0700, Paul Eggert wrote:
>
> > On a different note: Is the gnulib autobuild still a thing?
>
> Sorry, I don't know.  Simon would know, I expect.

I e-mailed him. Turns out that his build robot(s) stopped working, and
presumably no one else was submitting results, so the page eventually
went away.

It's unfortunate that Gnulib doesn't have any kind of officially-
sanctioned autobuild (as, say, the CMake project has); given how many
platform quirks it has to deal with, this would surely help.


--Daniel


-- 
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.


^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-10-10 23:29 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09  6:17 Error compiling strtoimax.c on hppa2.0w-hp-hpux11.11 Daniel Richard G.
2013-10-09  6:29 ` Paul Eggert
2013-10-09  6:51   ` Daniel Richard G.
2013-10-09  7:12     ` Paul Eggert
2013-10-09  7:29       ` Daniel Richard G.
2013-10-09 15:06         ` Paul Eggert
2013-10-09 18:42           ` Daniel Richard G.
2013-10-09 18:44             ` Paul Eggert
2013-10-10 23:29               ` Daniel Richard G.
2013-10-10 15:52           ` Tom G. Christensen
2013-10-10 16:18             ` Paul Eggert
2013-10-10 17:29               ` Tom G. Christensen
2013-10-10 18:24                 ` Eric Blake
2013-10-10 19:06                   ` Tom G. Christensen
2013-10-10 19:36                     ` Eric Blake
2013-10-10 19:52                       ` Tom G. Christensen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).