projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8462c0
)
Attempt to avoid a recursive include of wchar.h on IRIX 6.5.
author
Bruno Haible
<bruno@clisp.org>
Sat, 17 Jan 2009 13:06:30 +0000
(14:06 +0100)
committer
Bruno Haible
<bruno@clisp.org>
Sat, 17 Jan 2009 13:06:30 +0000
(14:06 +0100)
ChangeLog
patch
|
blob
|
history
lib/wchar.in.h
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 3d0769de1a2d1a03fb39f9415f6822b1e23c9b3c..0feaefc1d053e87ec061b484049f346a570d5ebc 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,11
@@
+2009-01-17 Bruno Haible <bruno@clisp.org>
+
+ * lib/wchar.in.h: In another particular situation, include only the
+ system's <wchar.h> file.
+ (_GL_ALREADY_INCLUDING_WCHAR_H): New macro.
+ Reported by Albert Chin-A-Young <china@thewrittenword.com>
+ and Thomas Guyot-Sionnest <dermoth@aei.ca>.
+
2009-01-17 Bruno Haible <bruno@clisp.org>
Support for stripping executables in --enable-relocatable.
2009-01-17 Bruno Haible <bruno@clisp.org>
Support for stripping executables in --enable-relocatable.
diff --git
a/lib/wchar.in.h
b/lib/wchar.in.h
index 77c068b93e273768eecf8a2f53eab59a3e1e5319..3c6cd7b891e38b75c21c6584951748164b8aa105 100644
(file)
--- a/
lib/wchar.in.h
+++ b/
lib/wchar.in.h
@@
-30,7
+30,7
@@
@PRAGMA_SYSTEM_HEADER@
#endif
@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
/* 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
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@
#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
@@
-47,6
+50,8
@@
#ifndef _GL_WCHAR_H
#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
/* 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
# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
#endif
+#undef _GL_ALREADY_INCLUDING_WCHAR_H
+
#ifndef _GL_WCHAR_H
#define _GL_WCHAR_H
#ifndef _GL_WCHAR_H
#define _GL_WCHAR_H