You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by ab...@apache.org on 2007/05/30 19:31:32 UTC
svn commit: r542886 - in /incubator/stdcxx/trunk/util: aliases.cpp
charmap.cpp charmap.h locale.cpp
Author: ablack
Date: Wed May 30 10:31:31 2007
New Revision: 542886
URL: http://svn.apache.org/viewvc?view=rev&rev=542886
Log:
2007-05-30 Andrew Black <ab...@roguewave.com>
STDCXX-117
* aliases.cpp [_RWSTD_NO_NL_LANGINFO] (<langinfo.h>): Guarded
against inclusion when the header is detected to be missing at
configuration time.
* charmap.cpp [_RWSTD_NO_ICONV] (<iconv.h>): Ditto.
* charmap.h [_RWSTD_NO_ICONV] (<iconv.h>): Ditto.
* locale.cpp [_RWSTD_NO_ICONV] (<iconv.h>): Ditto.
[_RWSTD_NO_NL_LANGINFO] (<langinfo.h>): Ditto.
Modified:
incubator/stdcxx/trunk/util/aliases.cpp
incubator/stdcxx/trunk/util/charmap.cpp
incubator/stdcxx/trunk/util/charmap.h
incubator/stdcxx/trunk/util/locale.cpp
Modified: incubator/stdcxx/trunk/util/aliases.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/aliases.cpp?view=diff&rev=542886&r1=542885&r2=542886
==============================================================================
--- incubator/stdcxx/trunk/util/aliases.cpp (original)
+++ incubator/stdcxx/trunk/util/aliases.cpp Wed May 30 10:31:31 2007
@@ -49,7 +49,9 @@
#ifndef _MSC_VER
-# include <langinfo.h>
+# ifndef _RWSTD_NO_NL_LANGINFO
+# include <langinfo.h>
+# endif
#endif // _MSC_VER
#include "aliases.h"
Modified: incubator/stdcxx/trunk/util/charmap.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/charmap.cpp?view=diff&rev=542886&r1=542885&r2=542886
==============================================================================
--- incubator/stdcxx/trunk/util/charmap.cpp (original)
+++ incubator/stdcxx/trunk/util/charmap.cpp Wed May 30 10:31:31 2007
@@ -32,7 +32,9 @@
// _XOPEN_SOURCE macro in assert.h selects a different declaration for
// iconv than the one used in comp test.
#ifndef _MSC_VER
-# include <iconv.h>
+# ifndef _RWSTD_NO_ICONV
+# include <iconv.h>
+# endif
# include _RWSTD_CERRNO
#else
# include <windows.h>
Modified: incubator/stdcxx/trunk/util/charmap.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/charmap.h?view=diff&rev=542886&r1=542885&r2=542886
==============================================================================
--- incubator/stdcxx/trunk/util/charmap.h (original)
+++ incubator/stdcxx/trunk/util/charmap.h Wed May 30 10:31:31 2007
@@ -36,7 +36,9 @@
#include <set>
#ifndef _MSC_VER
-# include <iconv.h>
+# ifndef _RWSTD_NO_ICONV
+# include <iconv.h>
+# endif
#endif // _MSC_VER
#include "scanner.h"
Modified: incubator/stdcxx/trunk/util/locale.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/locale.cpp?view=diff&rev=542886&r1=542885&r2=542886
==============================================================================
--- incubator/stdcxx/trunk/util/locale.cpp (original)
+++ incubator/stdcxx/trunk/util/locale.cpp Wed May 30 10:31:31 2007
@@ -37,8 +37,12 @@
#ifndef _MSC_VER
# include <sys/mman.h> // for mmap()
# include <unistd.h> // for close ()
-# include <iconv.h>
-# include <langinfo.h>
+# ifndef _RWSTD_NO_ICONV
+# include <iconv.h>
+# endif
+# ifndef _RWSTD_NO_NL_LANGINFO
+# include <langinfo.h>
+# endif
#else
# include <io.h> // for open()
# include <windows.h>