diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-01-18 09:42:04 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2009-01-18 09:42:04 -0500 |
| commit | 9276888e34dfdde8adb112953a4adbd8d98f5918 (patch) | |
| tree | 193e1ebd26e63facc7130476ff0f14334ace4e0a | |
| parent | 7903d763bb1643109cdf0c55d15a4026cec8ea6c (diff) | |
| download | monitoring-plugins-9276888e34dfdde8adb112953a4adbd8d98f5918.tar.gz | |
Trying out new patch for IRIX 6.5 from Bruno Haible
See: http://article.gmane.org/gmane.comp.lib.gnulib.bugs/16341
| -rw-r--r-- | gl/wchar.in.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gl/wchar.in.h b/gl/wchar.in.h index e069cfaa..cc436b14 100644 --- a/gl/wchar.in.h +++ b/gl/wchar.in.h @@ -30,7 +30,7 @@ @PRAGMA_SYSTEM_HEADER@ #endif -#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) +#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 /* Special invocation convention: - Inside uClibc header files. - On HP-UX 11.00 we have a sequence of nested includes @@ -38,7 +38,10 @@ once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h> and once directly. In both situations 'wint_t' is not yet defined, therefore we cannot provide the function overrides; instead include only - the system's <wchar.h>. */ + the system's <wchar.h>. + - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and + the latter includes <wchar.h>. But here, we have no way to detect whether + <wctype.h> is completely included or is still being included. */ #@INCLUDE_NEXT@ @NEXT_WCHAR_H@ @@ -47,6 +50,8 @@ #ifndef _GL_WCHAR_H +#define _GL_ALREADY_INCLUDING_WCHAR_H + /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before <wchar.h>. BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be @@ -62,6 +67,8 @@ # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ #endif +#undef _GL_ALREADY_INCLUDING_WCHAR_H + #ifndef _GL_WCHAR_H #define _GL_WCHAR_H |