stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r666101 - in /stdcxx/branches/4.2.x: etc/config/src/ src/ src/i86/ tests/localization/ tests/src/ util/
Date Tue, 10 Jun 2008 13:39:43 GMT
Author: faridz
Date: Tue Jun 10 06:39:42 2008
New Revision: 666101

URL: http://svn.apache.org/viewvc?rev=666101&view=rev
Log:
2008-06-10  Farid Zaripov  <farid_zaripov@epam.com>

	* etc/config/src/NO_INT_TRAPS.cpp: Call nodbg() to disable popups on MinGW.
	Use __try/__except on MSVC and ICC/Windows only.
	* src/i86/atomic.s: Prepend symbols by underscore on MinGW.
	* src/time_put.cpp (__rw_put_time): swprintf() on MinGW doesn't conform to
	the C standard.
	* tests/src/thread.cpp: On MinGW #include <stdint.h> to define uintptr_t type.
	* tests/localization/22.locale.codecvt.cpp: Replace _MSC_VER to _WIN32 in
	preprocessor conditions to compile on MinGW.
	* tests/localization/22.locale.ctype.cpp: Ditto.
	* tests/localization/22.locale.ctype.is.cpp: Ditto.
	* tests/localization/22.locale.ctype.narrow.cpp: Ditto.
	* tests/localization/22.locale.ctype.scan.cpp: Ditto.
	* tests/localization/22.locale.ctype.tolower.cpp: Ditto.
	* tests/localization/22.locale.ctype.toupper.cpp: Ditto.
	* tests/localization/22.locale.messages.cpp: Ditto.
	* util/aliases.cpp: Ditto.
	* util/charmap.cpp: Ditto.
	* util/charmap.h: Ditto.
	* util/ctype.cpp: Ditto.
	* util/locale.cpp: Ditto.
	* util/localedef.cpp: Ditto.
	* util/memchk.cpp: Ditto.
	* util/path.cpp: Ditto.
	* util/scanner.cpp: Ditto.
	* tests/src/locale.cpp: Ditto. #include <crtdbg.h> on MSVC only.

Modified:
    stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp
    stdcxx/branches/4.2.x/src/i86/atomic.s
    stdcxx/branches/4.2.x/src/time_put.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.codecvt.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.is.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.narrow.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.scan.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.tolower.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.toupper.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.messages.cpp
    stdcxx/branches/4.2.x/tests/src/locale.cpp
    stdcxx/branches/4.2.x/tests/src/thread.cpp
    stdcxx/branches/4.2.x/util/aliases.cpp
    stdcxx/branches/4.2.x/util/charmap.cpp
    stdcxx/branches/4.2.x/util/charmap.h
    stdcxx/branches/4.2.x/util/ctype.cpp
    stdcxx/branches/4.2.x/util/locale.cpp
    stdcxx/branches/4.2.x/util/localedef.cpp
    stdcxx/branches/4.2.x/util/memchk.cpp
    stdcxx/branches/4.2.x/util/path.cpp
    stdcxx/branches/4.2.x/util/scanner.cpp

Modified: stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp Tue Jun 10 06:39:42 2008
@@ -22,13 +22,16 @@
  * 
  **************************************************************************/
 
-#if defined (_WIN32) && !defined (__CYGWIN__)
+#include "nodbg.h"
+
+
+#if defined (_MSC_VER)
 #  define TRY             __try
 #  define EXCEPT(expr)    __except (expr)
-#else   // not Windows
+#else   // not MSVC
 #  define TRY               if (1)
 #  define EXCEPT(ignore)    else if (0)
-#endif   // _WIN32
+#endif   // _MSC_VER
 
 
 int get_int (int);
@@ -40,6 +43,8 @@
 
 int main (int argc, char*[])
 {
+    nodbg ();
+
     // test expects to be called with no command line arguments
     // i.e., (argc < 2) is expected to hold
 

Modified: stdcxx/branches/4.2.x/src/i86/atomic.s
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/i86/atomic.s?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/i86/atomic.s (original)
+++ stdcxx/branches/4.2.x/src/i86/atomic.s Tue Jun 10 06:39:42 2008
@@ -33,7 +33,7 @@
 #  define TYPE_DIR(ign1, ign2)
 #endif
 
-#if defined (__CYGWIN__)
+#if defined (__CYGWIN__) || defined (__MINGW32__)
    /* on cygwin used COFF object file format
       C-functions names should prepended by '_' */
 #  define SYMNAME(name)    _##name

Modified: stdcxx/branches/4.2.x/src/time_put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/time_put.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/time_put.cpp (original)
+++ stdcxx/branches/4.2.x/src/time_put.cpp Tue Jun 10 06:39:42 2008
@@ -2815,7 +2815,7 @@
         const wchar_t *fmtstr = 'z' == fmt ? L"%+*.*d" : L"%*.*d";
 
         res = swprintf (wbuf, 
-#if !defined (_MSC_VER) || 1400 <= _MSC_VER
+#if !defined (__MINGW32__) && (!defined (_MSC_VER) || 1400 <= _MSC_VER)
                         // MSVC 8.0 changed swprintf() to conform
                         // to the C standard signature
                         bufsize,

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.codecvt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.codecvt.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.codecvt.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.codecvt.cpp Tue Jun 10 06:39:42 2008
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  include <iconv.h>      // for iconv(), iconv_open(), iconv_close()
 #  include <langinfo.h>   // for CODESET, nl_langinfo()
 #  include <unistd.h>
@@ -847,7 +847,7 @@
 
 /****************************************************************************/
 
-#if !defined _MSC_VER
+#if !defined _WIN32
 
 static unsigned int endian_test = 1;
 static bool big_endian = *(unsigned char*)&endian_test == 0;
@@ -908,7 +908,7 @@
         out_sz = (tmp + 1 - out_sz) / sizeof (wchar_t);
 }
 
-#endif // defined _MSC_VER
+#endif // defined _WIN32
 
 
 enum InternalEncoding {
@@ -936,12 +936,12 @@
 
     switch (conv) {
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
     case use_UCS2:
         // fall through...
 
-#endif   // _MSC_VER
+#endif   // _WIN32
 
     case use_libc: {
 
@@ -952,7 +952,7 @@
         break;
     }
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 
     case use_UCS2:
     case use_UCS4: {
@@ -977,7 +977,7 @@
         break;
     }
 
-#endif   // _MSC_VER
+#endif   // _WIN32
 
     }
 
@@ -2462,10 +2462,10 @@
         { "fr_FR", "ISO-8859-1", "fr_FR.ISO-8859-1",  3920,  3920, 1, 1 },
         // multi-byte encodings (variable width, and max_length > 1)
         { "ja_JP", "Shift_JIS" , "ja_JP.Shift_JIS", 25115, 13001, 0, 2 },
-#if !defined _MSC_VER
+#if !defined _WIN32
         { "ja_JP", "EUC-JP"    , "ja_JP.EUC-JP",    20801, 14299, 0, 3 },
         { "ja_JP", "UTF-8"     , "ja_JP.UTF-8",     25056, 12000, 0, 6 },
-#endif // !defined _MSC_VER
+#endif // !defined _WIN32
 
         // terminate the array
         { 0, 0, 0, 0, 0, 0, 0 }
@@ -2608,3 +2608,4 @@
                     run_test, "", 0);
 }
 
+

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.cpp Tue Jun 10 06:39:42 2008
@@ -58,12 +58,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>     // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.is.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.is.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.is.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.is.cpp Tue Jun 10 06:39:42 2008
@@ -58,12 +58,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>        // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.narrow.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.narrow.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.narrow.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.narrow.cpp Tue Jun 10 06:39:42
2008
@@ -59,12 +59,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>        // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.scan.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.scan.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.scan.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.scan.cpp Tue Jun 10 06:39:42
2008
@@ -58,12 +58,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>     // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.tolower.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.tolower.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.tolower.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.tolower.cpp Tue Jun 10 06:39:42
2008
@@ -58,12 +58,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>     // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.toupper.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.toupper.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.toupper.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.ctype.toupper.cpp Tue Jun 10 06:39:42
2008
@@ -58,12 +58,12 @@
 #include <cwctype>    // for iswxxx()
 
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 #  if !defined (LC_MESSAGES)
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  include <langinfo.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <rw_driver.h>
 #include <rw_file.h>     // for SLASH

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.messages.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.messages.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.messages.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.messages.cpp Tue Jun 10 06:39:42 2008
@@ -42,7 +42,7 @@
 #include <cwchar>    // for mbsinit()
 
 #ifndef _RWSTD_NO_NEW_HEADER
-#  if defined (_MSC_VER)
+#  if defined (_WIN32)
 #    include <io.h>          // for _open()
 #    include <direct.h>      // for getcwd()
 #  else

Modified: stdcxx/branches/4.2.x/tests/src/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/locale.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/locale.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/locale.cpp Tue Jun 10 06:39:42 2008
@@ -58,7 +58,9 @@
 #  include <sys/wait.h>   // for WIFEXITED(), WIFSIGNALED(), WTERMSIG()
 #else
 #  include <io.h>
-#  include <crtdbg.h> // for _malloc_dbg()
+#  ifdef _MSC_VER
+#    include <crtdbg.h> // for _malloc_dbg()
+#  endif
 #endif
 
 #include <ios>        // for ios::*
@@ -75,16 +77,16 @@
 #include <ctype.h>
 #include <wchar.h>    // for wcslen, ...
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  include <clocale>
 #  ifndef LC_MESSAGES
 #    define LC_MESSAGES _RWSTD_LC_MESSAGES
 #  endif   // LC_MESSAGES
 #  define EXE_SUFFIX    ""
-#else   // if MSVC
+#else   // if Windows
 #  define _RWSTD_NO_LANGINFO
 #  define EXE_SUFFIX    ".exe"
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #ifndef _RWSTD_NO_LANGINFO
 #  include <langinfo.h>
@@ -1676,5 +1678,3 @@
 
     return true;
 }
-
-

Modified: stdcxx/branches/4.2.x/tests/src/thread.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/thread.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/thread.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/thread.cpp Tue Jun 10 06:39:42 2008
@@ -265,6 +265,9 @@
 /**************************************************************************/
 
 #elif defined (_WIN32) && defined (_MT)
+#  ifdef __MINGW32__
+#    include <stdint.h>   // for uintptr_t
+#  endif
 #  include <process.h>    // for _beginthreadex()
 
 _TEST_EXPORT int

Modified: stdcxx/branches/4.2.x/util/aliases.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/aliases.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/aliases.cpp (original)
+++ stdcxx/branches/4.2.x/util/aliases.cpp Tue Jun 10 06:39:42 2008
@@ -55,11 +55,11 @@
 #include <vector>
 
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  ifndef _RWSTD_NO_NL_LANGINFO
 #    include <langinfo.h>
 #  endif
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include "aliases.h"
 
@@ -292,7 +292,7 @@
     { 0, { 0 } }
 };
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 struct codepage_t
 {
@@ -322,10 +322,10 @@
     { 0, 0 }
 };
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 /****************************************************************************/
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 unsigned int get_codepage (const std::string& cname)
 {
@@ -336,7 +336,7 @@
     return 0;
 }
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 /*****************************************************************************/
 
@@ -414,7 +414,7 @@
         aliases.push_back (name);
 }
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 
 void get_lname_aliases (const std::string& name,
                         StringVector& aliases)
@@ -673,4 +673,4 @@
     return slocname;
 }
 
-#endif   // _MSC_VER
+#endif   // _WIN32

Modified: stdcxx/branches/4.2.x/util/charmap.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/charmap.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/charmap.cpp (original)
+++ stdcxx/branches/4.2.x/util/charmap.cpp Tue Jun 10 06:39:42 2008
@@ -31,14 +31,14 @@
 // On Compaq Tru64 UNIX if included after assert.h, the definition of
 // _XOPEN_SOURCE macro in assert.h selects a different declaration for 
 // iconv than the one used in comp test.
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  ifndef _RWSTD_NO_ICONV
 #    include <iconv.h>
 #  endif
 #  include _RWSTD_CERRNO
 #else
 #  include <windows.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <cassert>
 #include <cctype>
@@ -664,7 +664,7 @@
 bool Charmap::convert_to_ucs (const std::string &sym_name, 
                               const std::string &encoding, wchar_t& wc)
 {
-#ifndef _MSC_VER
+#ifndef _WIN32
 
     if (in_utf8_) {
         wc = utf8_decode (encoding.c_str (), &*(encoding.end () - 1));
@@ -709,7 +709,7 @@
     wc = convert_sym_to_ucs (sym_name);
     return true;
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 }
 
 
@@ -1045,7 +1045,7 @@
 
 #else   // if defined (_RWSTD_NO_ICONV)
 
-#  ifdef _MSC_VER
+#  ifdef _WIN32
             codepage_ = get_codepage (code_set_name_);
             if (codepage_ == 0) {
                 issue_diag (W_ICONV, false, 0, 
@@ -1053,7 +1053,7 @@
                             code_set_name_.c_str());
             }
 
-#  endif   // _MSC_VER
+#  endif   // _WIN32
 #endif   // _RWSTD_NO_ICONV
 
             scanner_.ignore_line ();

Modified: stdcxx/branches/4.2.x/util/charmap.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/charmap.h?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/charmap.h (original)
+++ stdcxx/branches/4.2.x/util/charmap.h Tue Jun 10 06:39:42 2008
@@ -195,9 +195,9 @@
     // the name of the codeset
     std::string code_set_name_;
 
-#if defined (_MSC_VER)
+#if defined (_WIN32)
     int codepage_;
-#endif // _MSC_VER
+#endif // _WIN32
 
     // n_cmap maps the symbolic name to a narrow character value
     // rn_cmap does the opposite
@@ -262,3 +262,4 @@
 
 #endif   // _RWSTD_CHARMAP_H_INCLUDED
 
+

Modified: stdcxx/branches/4.2.x/util/ctype.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/ctype.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/ctype.cpp (original)
+++ stdcxx/branches/4.2.x/util/ctype.cpp Tue Jun 10 06:39:42 2008
@@ -690,7 +690,7 @@
             if (next.token != Scanner::tok_string)
                 issue_diag (E_SYNTAX, true, &next,
                             "expected string following \"copy\" directive\n"); 
-#ifndef _MSC_VER           
+#ifndef _WIN32
 
             ctype_symlink_ = true;
 
@@ -712,7 +712,7 @@
                 continue;
             }
 
-#endif  // _MSC_VER            
+#endif  // _WIN32
 
             // bump up the nesting level
             nesting_level++;
@@ -891,7 +891,7 @@
     
     }
 
-#ifndef _MSC_VER
+#ifndef _WIN32
     
     if (ctype_symlink_) {
 
@@ -909,6 +909,6 @@
         return;
     }
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 }

Modified: stdcxx/branches/4.2.x/util/locale.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/locale.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/locale.cpp (original)
+++ stdcxx/branches/4.2.x/util/locale.cpp Tue Jun 10 06:39:42 2008
@@ -50,7 +50,7 @@
 #  define LS_1       "dir /B /A:D "
 #endif
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  include <sys/mman.h>   // for mmap()
 #  include <unistd.h>     // for close ()
 #  ifndef _RWSTD_NO_ICONV
@@ -62,7 +62,7 @@
 #else
 #  include <io.h>         // for open()
 #  include <windows.h>
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 #include <limits.h>      // for INT_MAX, INT_MIN
 #include <sys/stat.h>
@@ -256,7 +256,7 @@
             // map the file to a pointer and if it succeeds
             // return the pointer, otherwise return 0
 
-#ifndef _MSC_VER
+#ifndef _WIN32
             void* const ret = mmap (0, st.st_size, PROT_READ | PROT_WRITE,
                                     MAP_PRIVATE, fd, 0);
             if (MAP_FAILED == ret)
@@ -274,7 +274,7 @@
             void* const ret = MapViewOfFile (mapping, FILE_MAP_READ, 0,
                                              0, st.st_size);
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
             return ret;
         }
@@ -442,7 +442,7 @@
 static const char*
 set_locale (int lc_cat, const char *locname, const std::string &charmap_name)
 {
-#ifndef _MSC_VER
+#ifndef _WIN32
 
     assert (0 != locname);
 
@@ -476,7 +476,7 @@
         }
     }
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
     return 0;
 }
@@ -593,7 +593,7 @@
         // search for a C library locale that uses the same encoding
         std::string std_encoding (charmap);
 
-# if !defined(_MSC_VER)
+# if !defined (_WIN32)
         std::string C_locale (get_C_encoding_locale (std_encoding));
 # else
         std::string C_locale ("");

Modified: stdcxx/branches/4.2.x/util/localedef.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/localedef.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/localedef.cpp (original)
+++ stdcxx/branches/4.2.x/util/localedef.cpp Tue Jun 10 06:39:42 2008
@@ -140,9 +140,9 @@
     
     // the vector of corresponding C locales
     StringVector C_locales;
-#ifndef _MSC_VER
+#ifndef _WIN32
     get_same_encoding_C_locale (lname, cname, C_locales);
-#endif  // _MSC_VER
+#endif  // _WIN32
 
     // C library locale using same encoding
     std::string enc_C_locale;
@@ -256,18 +256,18 @@
     issue_diag (I_STAGE, false, 0, "generating LC_COLLATE database\n");
     def.write_collate (locale_dir);
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 
     issue_diag (I_STAGE, false, 0, "generating LC_MESSAGES database\n");
     def.write_messages (locale_dir);
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
     // no C library locales equivalents 
     if (C_locales.empty ())
         return;
 
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
 
     if (link_aliases == false)
         return;
@@ -283,7 +283,7 @@
         // pointing to our locale database
         create_symlink (outdir, std_locale, *it);
     }
-#endif  // _MSC_VER
+#endif  // _WIN32
 }
 
 

Modified: stdcxx/branches/4.2.x/util/memchk.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/memchk.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/memchk.cpp (original)
+++ stdcxx/branches/4.2.x/util/memchk.cpp Tue Jun 10 06:39:42 2008
@@ -26,14 +26,14 @@
  * 
  **************************************************************************/
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  include <fcntl.h>     // for open()
 #  include <unistd.h>    // for getpagesize(), write()
-#else   // if MSVC
+#else   // if Windows
 #  include <fcntl.h>     // for POSIX compatibility APIs
 #  include <io.h>        // ditto
 #  include <windows.h>   // for all of Win32 junk
-#endif   // MSVC
+#endif   // _WIN32
 
 #include <errno.h>       // for errno, EINTR
 #include <stddef.h>      // for size_t

Modified: stdcxx/branches/4.2.x/util/path.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/path.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/path.cpp (original)
+++ stdcxx/branches/4.2.x/util/path.cpp Tue Jun 10 06:39:42 2008
@@ -26,7 +26,7 @@
  * 
  **************************************************************************/
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 #  ifdef __linux__
      // for symlink()
 #    ifndef _XOPEN_SOURCE
@@ -45,7 +45,7 @@
 #  include <windows.h>     // for _getcwd()
 #  include <sys/types.h>
 #  include <sys/stat.h>    // for struct stat, stat()
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 
 #include "path.h"
@@ -69,7 +69,7 @@
 }
 
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 
 void
 create_symlink (const std::string &dir, 
@@ -112,7 +112,7 @@
     }
 }
 
-#endif  // _MSC_VER
+#endif  // _WIN32
 
 
 inline int
@@ -130,7 +130,7 @@
               const std::string &other /* = std::string () */)
 {
     // use absolute path as given by fname
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
     if (fname.size () && _RWSTD_PATH_SEP == fname [0]) 
 #else
     if (fname.size () && 
@@ -144,7 +144,7 @@
         other.substr (0,other.rfind (_RWSTD_PATH_SEP) + 1));
 
     // OR use the path given through "other", be it relative or absolute
-#if !defined (_MSC_VER)
+#if !defined (_WIN32)
     if (other.size () && _RWSTD_PATH_SEP == other [0]) {
 #else
     if (other.size () && 

Modified: stdcxx/branches/4.2.x/util/scanner.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/scanner.cpp?rev=666101&r1=666100&r2=666101&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/scanner.cpp (original)
+++ stdcxx/branches/4.2.x/util/scanner.cpp Tue Jun 10 06:39:42 2008
@@ -74,7 +74,7 @@
 
     for (; it != s.end (); it++)
         if (*it == '/' || *it == '\\') {
-#if defined (_MSC_VER)
+#if defined (_WIN32)
             *it = '\\';
 #else
             *it = '/';



Mime
View raw message