bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Build error with coreutils-8.3


From: Bruno Haible
Subject: Re: Build error with coreutils-8.3
Date: Sun, 10 Jan 2010 12:55:14 +0100
User-agent: KMail/1.9.9

Jim Meyering cited Brian Gough:
> since knowing that this is reproducible on fencepost might help debug it.

It's also reproducible on stock openSUSE 11.0 systems.

Jim Meyering cited Mike Frysinger:
> > commit 0f2ae55cf707947688bd28b55899a148fd3d7646
<http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0f2ae55cf707947688bd28b55899a148fd3d7646>
> >  2008-12-29  Ulrich Drepper  <address@hidden>
> >
> > +   [BZ #9694]
> > +   * wcsmbs/wchar.h: Move undefs for local __need_* constants to the
> > +   very end.
> > +
> >     * nscd/nscd_gethst_r.c (nscd_gethst_r): Don't use nscd if
> >     LOCALDOMAIN is defined.
> >     * nscd/nscd_getai.c (__nscd_getai): Likewise.
> ...
> I think it's a combination of the above and the recent change that added
> this #ifndef:

Yes, it looks very likely. So it must be related to gnulib's handling of
__need_mbstate_t and __need_wint_t.

> This patch does work, but seems too kludgey for my taste,

This patch works too (by doing the right thing when <wchar.h> is being included
from within /usr/include/wctype.h), and seems to be the right thing, therefore
I'm applying it.


2010-01-10  Bruno Haible  <address@hidden>

        wchar: Fix compilation error when <wchar.h> is used from coreutils.
        * lib/wchar.in.h: Treat __need_wint_t like __need_mbstate_t.
        Reported by Brian Gough <address@hidden> and
        Chris Clayton <address@hidden> via
        Mike Frysinger <address@hidden> and Jim Meyering <address@hidden>.

--- lib/wchar.in.h.orig Sun Jan 10 12:49:55 2010
+++ lib/wchar.in.h      Sun Jan 10 12:49:16 2010
@@ -30,9 +30,9 @@
 @PRAGMA_SYSTEM_HEADER@
 #endif
 
-#if defined __need_mbstate_t || (defined __hpux && ((defined 
_INTTYPES_INCLUDED && !defined strtoimax) || defined 
_GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
+#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && 
((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined 
_GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
 /* Special invocation convention:
-   - Inside uClibc header files.
+   - Inside glibc and uClibc header files.
    - On HP-UX 11.00 we have a sequence of nested includes
      <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
      once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]