Re: argp.h/argz.h and error_t

[Ralf Wildenhues]

[ this is http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/5424 ]

* Sergey Poznyakoff wrote on Sat, Feb 25, 2006 at 11:41:36AM CET:
> Ralf Wildenhues <address@hidden> wrote:
> 
> > The hack below fixes that, but I can imagine that it is not an
> > acceptable fix, given that this is libc code.  Should we rather
> > AC_DEFINE([__error_t_defined], 1, ..)?
> 
> Yes, I believe we should.

* Paul Eggert wrote on Sat, Feb 25, 2006 at 09:04:55AM CET:
>
> That would be better, I guess.

Sorry for the delay, here's a patch.  Cc:ing libtool-patches as the
owner of the argz module.  If you agree, I'll check this into Libtool
as well.

Cheers,
Ralf

        * argz.m4 (gl_FUNC_ARGZ): If we define `error_t', also define
        `__error_t_defined', so argp.h will not typedef the former.

Index: m4/argz.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/argz.m4,v
retrieving revision 1.3
diff -u -r1.3 argz.m4
--- m4/argz.m4  10 Nov 2005 14:24:22 -0000      1.3
+++ m4/argz.m4  17 Mar 2006 18:26:37 -0000
@@ -1,13 +1,13 @@
 # Portability macros for glibc argz.                    -*- Autoconf -*-
 # Written by Gary V. Vaughan <address@hidden>
 
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 3 argz.m4
+# serial 4 argz.m4
 
 AC_DEFUN([gl_FUNC_ARGZ],
 [gl_PREREQ_ARGZ
@@ -17,7 +17,9 @@
 AC_CHECK_TYPES([error_t],
   [],
   [AC_DEFINE([error_t], [int],
-   [Define to a type to use for `error_t' if it is not otherwise available.])],
+   [Define to a type to use for `error_t' if it is not otherwise available.])
+   AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
+    does not typedef error_t.])],
   [#if defined(HAVE_ARGZ_H)
 #  include <argz.h>
 #endif])