Mercurial > hg > octave-nkf > gnulib-hg
changeset 6721:93d12db0d11f
* argz.m4 (gl_FUNC_ARGZ): If we define `error_t', also define
`__error_t_defined', so argp.h will not typedef the former.
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
---|---|
date | Sat, 25 Mar 2006 11:05:05 +0000 |
parents | af0d674cde4f |
children | 106fa2e6b67f |
files | m4/ChangeLog m4/argz.m4 |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-03-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * argz.m4 (gl_FUNC_ARGZ): If we define `error_t', also define + `__error_t_defined', so argp.h will not typedef the former. + 2006-03-25 Paul Eggert <eggert@cs.ucla.edu> * regex.m4 (gl_REGEX): Don't insist on REG_SYNTAX_POSIX_EGREP,
--- a/m4/argz.m4 +++ b/m4/argz.m4 @@ -1,13 +1,13 @@ # Portability macros for glibc argz. -*- Autoconf -*- # Written by Gary V. Vaughan <gary@gnu.org> -# 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])