[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2131] nagiosplug/trunk/gl/wchar.in.h

[dermoth at users.sourceforge.net]

Revision: 2131
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2131&view=rev
Author:   dermoth
Date:     2009-01-18 14:46:30 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
Trying out new patch for IRIX 6.5 from Bruno Haible

See: http://article.gmane.org/gmane.comp.lib.gnulib.bugs/16341

From: Thomas Guyot-Sionnest <dermoth at aei.ca>

Modified Paths:
--------------
    nagiosplug/trunk/gl/wchar.in.h

Modified: nagiosplug/trunk/gl/wchar.in.h
===================================================================
--- nagiosplug/trunk/gl/wchar.in.h	2009-01-18 14:46:17 UTC (rev 2130)
+++ nagiosplug/trunk/gl/wchar.in.h	2009-01-18 14:46:30 UTC (rev 2131)
@@ -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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.