stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r665723 - in /stdcxx/branches/4.2.x: etc/config/src/ examples/include/ include/rw/ src/ tests/include/ tests/intro/ tests/iostream/ tests/localization/ tests/regress/ tests/src/ util/
Date Mon, 09 Jun 2008 15:42:19 GMT
Author: faridz
Date: Mon Jun  9 08:42:18 2008
New Revision: 665723

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

	* etc/config/src/LOCALE_NAME_FMAT.cpp: Simplified preprocessor condition
	(_WIN32 is always defined when _WIN64 is defined).
	* etc/config/src/NO_INT_TRAPS.cpp: Ditto.
	* etc/config/src/UNAME.cpp: Ditto.
	* etc/config/src/UNISTD_DECL.cpp: Ditto.
	* examples/include/stocks.h: Ditto.
	* include/rw/_config-icc.h: Ditto.
	* include/rw/_config.h: Ditto.
	* include/rw/_defs.h: Ditto.
	* include/rw/_mutex.h: Ditto.
	* src/catalog.h: Ditto.
	* src/file.cpp: Ditto.
	* src/memattr.cpp: Ditto.
	* src/num_put.cpp: Ditto.
	* tests/include/rw_testdefs.h: Ditto.
	* tests/intro/17.names.cpp: Ditto.
	* tests/iostream/27.filebuf.cpp: Ditto.
	* tests/iostream/27.ios.members.static.cpp: Ditto.
	* tests/iostream/27.objects.cpp: Ditto.
	* tests/localization/22.locale.ctype.cpp: Ditto.
	* tests/localization/22.locale.ctype.is.cpp: Ditto.
	* tests/localization/22.locale.messages.cpp: Ditto.
	* tests/localization/22.locale.num.put.cpp: Ditto.
	* tests/regress/18.limits.stdcxx-436.cpp: Ditto.
	* tests/src/alarm.cpp: Ditto.
	* tests/src/alloc.cpp: Ditto.
	* tests/src/driver.cpp: Ditto.
	* tests/src/file.cpp: Ditto.
	* tests/src/locale.cpp: Ditto.
	* tests/src/thread.cpp: Ditto.
	* util/cmdopt.cpp: Ditto.
	* util/exec.cpp: Ditto.
	* util/iconv.cpp: Ditto.
	* util/memchk.cpp: Ditto.
	* util/path.cpp: Ditto.
	* util/runall.cpp: Ditto.
	* util/target.h: Ditto.
	* util/util.cpp: Ditto.

Modified:
    stdcxx/branches/4.2.x/etc/config/src/LOCALE_NAME_FMAT.cpp
    stdcxx/branches/4.2.x/etc/config/src/NO_INT_TRAPS.cpp
    stdcxx/branches/4.2.x/etc/config/src/UNAME.cpp
    stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp
    stdcxx/branches/4.2.x/examples/include/stocks.h
    stdcxx/branches/4.2.x/include/rw/_config-icc.h
    stdcxx/branches/4.2.x/include/rw/_config.h
    stdcxx/branches/4.2.x/include/rw/_defs.h
    stdcxx/branches/4.2.x/include/rw/_mutex.h
    stdcxx/branches/4.2.x/src/catalog.h
    stdcxx/branches/4.2.x/src/file.cpp
    stdcxx/branches/4.2.x/src/memattr.cpp
    stdcxx/branches/4.2.x/src/num_put.cpp
    stdcxx/branches/4.2.x/tests/include/rw_testdefs.h
    stdcxx/branches/4.2.x/tests/intro/17.names.cpp
    stdcxx/branches/4.2.x/tests/iostream/27.filebuf.cpp
    stdcxx/branches/4.2.x/tests/iostream/27.ios.members.static.cpp
    stdcxx/branches/4.2.x/tests/iostream/27.objects.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.messages.cpp
    stdcxx/branches/4.2.x/tests/localization/22.locale.num.put.cpp
    stdcxx/branches/4.2.x/tests/regress/18.limits.stdcxx-436.cpp
    stdcxx/branches/4.2.x/tests/src/alarm.cpp
    stdcxx/branches/4.2.x/tests/src/alloc.cpp
    stdcxx/branches/4.2.x/tests/src/driver.cpp
    stdcxx/branches/4.2.x/tests/src/file.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/cmdopt.cpp
    stdcxx/branches/4.2.x/util/exec.cpp
    stdcxx/branches/4.2.x/util/iconv.cpp
    stdcxx/branches/4.2.x/util/memchk.cpp
    stdcxx/branches/4.2.x/util/path.cpp
    stdcxx/branches/4.2.x/util/runall.cpp
    stdcxx/branches/4.2.x/util/target.h
    stdcxx/branches/4.2.x/util/util.cpp

Modified: stdcxx/branches/4.2.x/etc/config/src/LOCALE_NAME_FMAT.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/LOCALE_NAME_FMAT.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/LOCALE_NAME_FMAT.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/LOCALE_NAME_FMAT.cpp Mon Jun  9 08:42:18 2008
@@ -129,7 +129,7 @@
 int print_locale_name_format (int, int, int, int, int, char, char);
 
 
-#if !defined (_WIN32) && !defined (_WIN64) || defined (__CYGWIN__)
+#if !defined (_WIN32) || defined (__CYGWIN__)
 char cat_seps[] = " \n\t/\\:;#%";
 #else
 char cat_seps[] = "\n\t/\\:;#%";

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=665723&r1=665722&r2=665723&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 Mon Jun  9 08:42:18 2008
@@ -22,13 +22,13 @@
  * 
  **************************************************************************/
 
-#if (defined (_WIN32) || defined (_WIN64)) && !defined (__CYGWIN__)
+#if defined (_WIN32) && !defined (__CYGWIN__)
 #  define TRY             __try
 #  define EXCEPT(expr)    __except (expr)
 #else   // not Windows
 #  define TRY               if (1)
 #  define EXCEPT(ignore)    else if (0)
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 
 int get_int (int);

Modified: stdcxx/branches/4.2.x/etc/config/src/UNAME.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/UNAME.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/UNAME.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/UNAME.cpp Mon Jun  9 08:42:18 2008
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <sys/utsname.h>
 #else
 #  include <windows.h>

Modified: stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp (original)
+++ stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp Mon Jun  9 08:42:18 2008
@@ -28,11 +28,11 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#if (defined (_WIN32) || defined (_WIN64)) && !defined (__CYGWIN__)
+#if defined (_WIN32) && !defined (__CYGWIN__)
 #  include <io.h>
 #else
 #  include <unistd.h>
-#endif   // _WIN32 || _WIN64
+#endif   // _WIN32
 
 // Windows defines the equivalent SSIZE_T in the platform SDK
 // as the signed equivalent of size_t which is defined as long
@@ -108,9 +108,9 @@
 
 #ifndef _RWSTD_NO_LONG_LONG
 #  define LONG_LONG   long long
-#elif defined (_WIN32) || defined (_WIN64)
+#elif defined (_WIN32)
 #  define LONG_LONG   __int64
-#endif   // _RWSTD_NO_LONG_LONG, _WIN{32,64}
+#endif   // _RWSTD_NO_LONG_LONG, _WIN32
 
 
 #if defined (LONG_LONG)

Modified: stdcxx/branches/4.2.x/examples/include/stocks.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/examples/include/stocks.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/examples/include/stocks.h (original)
+++ stdcxx/branches/4.2.x/examples/include/stocks.h Mon Jun  9 08:42:18 2008
@@ -72,7 +72,7 @@
 #  define GERMAN_LOCALE         "De"
 #  define FRENCH_LOCALE         "Fr_FR.850"
 #  define JAPANESE_LOCALE       "Ja_JP.932"
-#elif defined (_WIN32) || defined (_WIN64)
+#elif defined (_WIN32)
 #  define US_LOCALE             "us"
 #  define GERMAN_LOCALE         "german_germany.1252"
 #  define FRENCH_LOCALE         "french_france.1252"

Modified: stdcxx/branches/4.2.x/include/rw/_config-icc.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_config-icc.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_config-icc.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_config-icc.h Mon Jun  9 08:42:18 2008
@@ -29,7 +29,7 @@
  * 
  **************************************************************************/
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
    // enable the <cxxx> form of libc headers
    // we can only use the rw version in include/ansi
@@ -53,7 +53,7 @@
 #    endif   // _RWSTD_NO_EXCEPTIONS
 #  endif
 
-#else   // if defined (_WIN{32,64})
+#else   // ifdef _WIN32
 
 #  include "_config-msvcrt.h"
 
@@ -69,4 +69,4 @@
 // disable "dllexport/dllimport conflict with ... ; dllexport assumed"
 #  pragma warning (disable: 1740)
 
-#endif   // (_WIN{32,64})
+#endif   // _WIN32

Modified: stdcxx/branches/4.2.x/include/rw/_config.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_config.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_config.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_config.h Mon Jun  9 08:42:18 2008
@@ -274,7 +274,7 @@
 
 /*** Win{32,64} ***********************************************************/
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #  define _RWSTD_NO_STATIC_MUTEX_INIT
 #  define _RWSTD_PATH_SEP '\\'
 #endif   // _WIN32
@@ -303,9 +303,9 @@
 
    // default to POSIX threads except on Win32 or Win64
 
-#    if !defined (_WIN32) && !defined (_WIN64)
+#    ifndef _WIN32
 #      define _RWSTD_POSIX_THREADS
-#    endif   // _WIN{32,64}
+#    endif   // _WIN32
 #  endif   // _RWSTD_*_THREADS
 #endif   // _RWSTD_REENTRANT
 

Modified: stdcxx/branches/4.2.x/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_defs.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_defs.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_defs.h Mon Jun  9 08:42:18 2008
@@ -470,8 +470,7 @@
 // _DLL - defined by the compiler when either -MD or -MDd is used
 // RWDLL - defined for all Rogue Wave(R) products built as shared libs
 // _RWSHARED - defined for libstd built/used as a shared lib
-#if (defined (_WIN32) || defined (_WIN64)) && \
-    (defined (RWDLL)  || defined (_RWSHARED))
+#if defined (_WIN32) && (defined (RWDLL) || defined (_RWSHARED))
 
 #  ifdef _RWSTD_LIB_SRC
 #    define _RWSTD_EXPORT            __declspec (dllexport)
@@ -486,7 +485,7 @@
 #  define _RWSTD_EXPORT          /* empty */
 #  define _RWSTD_CLASS_EXPORT    /* empty */
 #  define _RWSTD_MEMBER_EXPORT   /* empty */
-#endif // _WIN32 || _WIN64
+#endif // _WIN32
 
 #ifdef _RWSTD_NO_BOOL
 #  define bool    int

Modified: stdcxx/branches/4.2.x/include/rw/_mutex.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_mutex.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_mutex.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_mutex.h Mon Jun  9 08:42:18 2008
@@ -120,7 +120,7 @@
 #  define _RWSTD_MUTEX_UNLOCK(mutex)    pthread_mutex_unlock (&mutex)
 #  define _RWSTD_MUTEX_T                pthread_mutex_t
 
-#elif defined (_WIN32) || defined (_WIN64)
+#elif defined (_WIN32)
 
 #  ifdef _RWSTD_NO_FWD_DECLARATIONS
 

Modified: stdcxx/branches/4.2.x/src/catalog.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/catalog.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/catalog.h (original)
+++ stdcxx/branches/4.2.x/src/catalog.h Mon Jun  9 08:42:18 2008
@@ -37,7 +37,7 @@
 
 #include <rw/_defs.h>
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #  define _RWSTD_USE_RC 1
 #  include <windows.h>
 #endif

Modified: stdcxx/branches/4.2.x/src/file.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/file.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/file.cpp (original)
+++ stdcxx/branches/4.2.x/src/file.cpp Mon Jun  9 08:42:18 2008
@@ -43,15 +43,15 @@
 #include <ctype.h>    // for isalpha(), isspace(), toupper()
 
 
-#if (defined (_WIN32) || defined (_WIN64)) && !defined (__CYGWIN__)
+#if defined (_WIN32) && !defined (__CYGWIN__)
 #  include <fcntl.h>
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
-#endif   // _WIN32 || _WIN64
+#endif   // _WIN32
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #  define _BINARY _O_BINARY
 #else
 #  define _BINARY 0
@@ -267,7 +267,7 @@
 
     modebits |= _RWSTD_O_EXCL | _RWSTD_O_CREAT;
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
     // tempnam(const char *dir, const char *prefix) will generate
     // a unique file name for a directory chosen by the following rules:
@@ -305,7 +305,7 @@
     // deallocate storage allocated by tempnam()
     free (fname);
     
-#  else   // if !(defined (_WIN32) || defined (_WIN64))
+#  else   // ifndef _WIN32
 
     char tmpbuf [L_tmpnam];
 
@@ -321,7 +321,7 @@
     if (fd >= 0)
         unlink (fname);
 
-#  endif   // _WIN{32,64}
+#  endif   // _WIN32
 #endif   // _RWSTD_NO_MKSTEMP
 
     return fd;
@@ -429,14 +429,14 @@
 __rw_fdmode (int fd)
 {
 // FIXME -- need to have equivalent of fcntl() on win32.
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
     return fd == _RWSTD_STDIN_FILENO
                ? _RWSTD_IOS_IN
                : fd == _RWSTD_STDOUT_FILENO || fd == _RWSTD_STDERR_FILENO
                    ? _RWSTD_IOS_OUT : _RWSTD_IOS_OUT | _RWSTD_IOS_IN;
 
-#else   // if !defined (_WIN{32,64})
+#else   // ifndef _WIN32
 
    const int m = fcntl (fd, _RWSTD_F_GETFL);
 

Modified: stdcxx/branches/4.2.x/src/memattr.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/memattr.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/memattr.cpp (original)
+++ stdcxx/branches/4.2.x/src/memattr.cpp Mon Jun  9 08:42:18 2008
@@ -41,7 +41,7 @@
 #  define _WIN32
 #endif
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  ifdef __SUNPRO_CC
      // working around SunOS bug #568
 #    include <time.h>
@@ -69,7 +69,7 @@
 #  endif   // _SC_PAGE_SIZE
 #else
 #  include <windows.h>    // for everything (ugh)
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 #include <rw/_defs.h>
 
@@ -104,7 +104,7 @@
     // of the three, in addition to 0 (PROT_NONE)
     _RWSTD_UNUSED (attr);
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
     const int errno_save = errno;
 
@@ -232,7 +232,7 @@
 
     return _RWSTD_STATIC_CAST (_RWSTD_SSIZE_T, nbytes);
 
-#else   // if defined (_WIN{32,64})
+#else   // ifdef _WIN32
 
     LPVOID const ptr = _RWSTD_CONST_CAST (LPVOID, addr);
 

Modified: stdcxx/branches/4.2.x/src/num_put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/num_put.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/num_put.cpp (original)
+++ stdcxx/branches/4.2.x/src/num_put.cpp Mon Jun  9 08:42:18 2008
@@ -618,7 +618,7 @@
 __rw_fix_flt (char *&end, _RWSTD_SIZE_T &len,
               unsigned flags, _RWSTD_STREAMSIZE prec)
 {
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
     char* beg = end - len;
 
@@ -768,7 +768,7 @@
     if (sgn)
         ++len;
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 }
 

Modified: stdcxx/branches/4.2.x/tests/include/rw_testdefs.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/include/rw_testdefs.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/include/rw_testdefs.h (original)
+++ stdcxx/branches/4.2.x/tests/include/rw_testdefs.h Mon Jun  9 08:42:18 2008
@@ -43,8 +43,7 @@
 #endif   // _RWSTD_TEST_SRC
 
 
-#if    (defined (_WIN32) || defined (_WIN64)) \
-    && (defined (RWDLL) || defined (_RWSHARED))
+#if defined (_WIN32) && (defined (RWDLL) || defined (_RWSHARED))
 #  ifndef _RWSTD_TEST_SRC
      // using a shared lib, import names
 #    define _TEST_EXPORT   __declspec (dllimport)

Modified: stdcxx/branches/4.2.x/tests/intro/17.names.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/intro/17.names.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/intro/17.names.cpp (original)
+++ stdcxx/branches/4.2.x/tests/intro/17.names.cpp Mon Jun  9 08:42:18 2008
@@ -78,7 +78,7 @@
 // include system headers included by the library
 #include <fcntl.h>
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 #  include <io.h>
 #else
 #  include <unistd.h>

Modified: stdcxx/branches/4.2.x/tests/iostream/27.filebuf.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/iostream/27.filebuf.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/iostream/27.filebuf.cpp (original)
+++ stdcxx/branches/4.2.x/tests/iostream/27.filebuf.cpp Mon Jun  9 08:42:18 2008
@@ -34,7 +34,7 @@
 
 #include <fstream>
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
 #  ifdef __SUNPRO_CC
      // working around a SunOS/SunPro bug (PR #26255)
@@ -50,7 +50,7 @@
 #else
 #  include <fcntl.h>      // for O_XXX constants
 #  include <io.h>         // for open()
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 #ifndef SIGPIPE
 #  define SIGPIPE   13   /* HP-UX, Linux, and SunOS value */
@@ -927,7 +927,7 @@
     }
 
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
     //////////////////////////////////////////////////////////////////
     // exercise open (..., ios::ate)
@@ -1049,7 +1049,7 @@
         REMOVE_FILE (tmpfname);
     }
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 }
 

Modified: stdcxx/branches/4.2.x/tests/iostream/27.ios.members.static.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/iostream/27.ios.members.static.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/iostream/27.ios.members.static.cpp (original)
+++ stdcxx/branches/4.2.x/tests/iostream/27.ios.members.static.cpp Mon Jun  9 08:42:18 2008
@@ -43,7 +43,7 @@
 #include <rw_driver.h>
 #include <rw_file.h>
 
-#if !defined _WIN32 && !defined _WIN64
+#ifndef _WIN32
 
 #  include <fcntl.h>
 #  include <unistd.h>
@@ -52,7 +52,7 @@
 
 #  define DEV_TTY   "/dev/tty"
 
-#else   // if defined _WIN32 || defined _WIN64
+#else   // ifdef _WIN32
 
 #  include <fcntl.h>
 #  include <io.h>
@@ -65,7 +65,7 @@
 
 #  define DEV_TTY   "CON:"
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 
 // use buffers larger than L_tmpnam with rw_tmpnam()
@@ -405,7 +405,7 @@
         return 1;
     }
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
     // create three child process and have each redirect
     // its stdout, stderr, and both, respectively, to
@@ -443,7 +443,7 @@
         }
     }
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
     do_test ();
 

Modified: stdcxx/branches/4.2.x/tests/iostream/27.objects.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/iostream/27.objects.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/iostream/27.objects.cpp (original)
+++ stdcxx/branches/4.2.x/tests/iostream/27.objects.cpp Mon Jun  9 08:42:18 2008
@@ -61,7 +61,7 @@
 } lifetime_check;
 
 
-#if defined (_WIN32) | defined (_WIN64)
+#ifdef _WIN32
    // bring in <windows.h> as a compilation test to exercise
    // any potential collisions with our declarations
 #  include <windows.h>

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=665723&r1=665722&r2=665723&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 Mon Jun  9 08:42:18 2008
@@ -1111,7 +1111,7 @@
                    "{ %s}, got { %s}",
                    uch, locname, is_C, is_CXX2);
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
         // exercise POSIX requirements only on POSIX platforms
 

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=665723&r1=665722&r2=665723&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 Mon Jun  9 08:42:18 2008
@@ -593,7 +593,7 @@
                    "{ %s}, got { %s}",
                    uch, locname, is_C, is_CXX2);
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 
         // exercise POSIX requirements only on POSIX platforms
 

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=665723&r1=665722&r2=665723&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 Mon Jun  9 08:42:18 2008
@@ -570,13 +570,13 @@
 #endif   // _RWSTD_NO_EXCEPTIONS
 
     // Bad set id
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
     // When we use resource files for the message catalogs
     // the set ids are ignored.
     rw_assert (msgs.get (cat, 777, 1, def) == def, 0, __LINE__,
                "messages<%s>::get(%d, 777, 1, %{#*Ac}) == %{#*Ac}",
                cname, cat, int (sizeof *def), def, int (sizeof *def), def);
-#endif   // !defined (_WIN32) && !defined (_WIN64)
+#endif   // _WIN32
 
     // Bad message id
     rw_assert (msgs.get (cat, 1, 777, def) == def, 0, __LINE__,

Modified: stdcxx/branches/4.2.x/tests/localization/22.locale.num.put.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/localization/22.locale.num.put.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/localization/22.locale.num.put.cpp (original)
+++ stdcxx/branches/4.2.x/tests/localization/22.locale.num.put.cpp Mon Jun  9 08:42:18 2008
@@ -358,7 +358,7 @@
             std::sprintf (cbuf, str, val);
             str = cbuf;
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
             std::size_t len = std::strlen (str);
 
@@ -370,7 +370,7 @@
                 cbuf [len - 1] = cbuf [len];
             }
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
         }
 
         // compare output produced by num_put with that produced by printf()

Modified: stdcxx/branches/4.2.x/tests/regress/18.limits.stdcxx-436.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/regress/18.limits.stdcxx-436.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/regress/18.limits.stdcxx-436.cpp (original)
+++ stdcxx/branches/4.2.x/tests/regress/18.limits.stdcxx-436.cpp Mon Jun  9 08:42:18 2008
@@ -32,10 +32,10 @@
 #undef __PURE_CNAME
 #include <stdio.h>   // for popen(), fscanf(), pclose(), ...
 
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32
 #  define popen  _popen
 #  define pclose _pclose
-#endif  // defined(_WIN32) || defined(_WIN64)
+#endif  // _WIN32
 
 int main ()
 {

Modified: stdcxx/branches/4.2.x/tests/src/alarm.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/alarm.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/alarm.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/alarm.cpp Mon Jun  9 08:42:18 2008
@@ -61,7 +61,7 @@
 _rw_alarm_handler;
 
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
 #include <windows.h>
 
@@ -121,7 +121,7 @@
 }
 
 
-#else   // if !defined (_WIN{32,64}
+#else   // ifndef _WIN32
 
 #  include <signal.h>   // for SIGALRM, signal()
 #  include <unistd.h>   // for alarm(), write()
@@ -225,4 +225,4 @@
 }
 
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32

Modified: stdcxx/branches/4.2.x/tests/src/alloc.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/alloc.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/alloc.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/alloc.cpp Mon Jun  9 08:42:18 2008
@@ -39,7 +39,7 @@
 #  define _WIN32
 #endif
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  ifdef __SUNPRO_CC
 // working around SunOS bug #568
 #    include <time.h>
@@ -64,7 +64,7 @@
 // still declare the functions to take char* (aliased as caddr_t)
 typedef _RWSTD_MUNMAP_ARG1_T CaddrT;
 
-#else   // defined (_WIN32) || defined (_WIN64)
+#else   // ifdef _WIN32
 
 #  include <windows.h>    // for everything (ugh)
 #  include <sys/types.h>  // for off_t
@@ -160,7 +160,7 @@
     return -1;
 }
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 #ifndef MAP_PRIVATE
 #  define MAP_PRIVATE     0

Modified: stdcxx/branches/4.2.x/tests/src/driver.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/driver.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/driver.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/driver.cpp Mon Jun  9 08:42:18 2008
@@ -53,7 +53,7 @@
 #  include <crtdbg.h>  // for _CrtSetReportMode(), _CrtSetDbgFlag()
 #endif   // _MSC_VER
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <unistd.h>         // for isatty()
 #  include <sys/resource.h>   // for setlimit()
 
@@ -75,7 +75,7 @@
 #else   // if Windows
    // no isatty on Windoze
 #  define _RWSTD_NO_ISATTY
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC

Modified: stdcxx/branches/4.2.x/tests/src/file.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/file.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/file.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/file.cpp Mon Jun  9 08:42:18 2008
@@ -45,7 +45,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#if !defined  (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <langinfo.h>   // for CODESET
 #  include <unistd.h>     // for close(), open()
 #else
@@ -167,12 +167,12 @@
     }
     else {
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
         const char* const codeset = nl_langinfo (CODESET);
 #else
         // FIXME: determine the current code page
         const char* const codeset = "UTF-8";
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
         fprintf (fp, "<code_set_name> \"%s\"\n", codeset);
         fprintf (fp, "<mb_cur_max> 1\n");
@@ -248,7 +248,7 @@
 #  undef TMP_TEMPLATE
 #else   // if defined (_RWSTD_NO_MKSTEMP)
 
-#  if defined (_WIN32) || defined (_WIN64)
+#  ifdef _WIN32
 
     // create a temporary file name
     char* fname = tempnam (P_tmpdir, ".rwtest-tmp");
@@ -294,7 +294,7 @@
         fprintf (stderr, "%s:%d: tmpnam(\"%s\") failed: %s\n",
                  __FILE__, __LINE__, buf, strerror (errno));
 
-#  endif   // _WIN{32,64}
+#  endif   // _WIN32
 #endif   // _RWSTD_NO_MKSTEMP
 
     return fname;
@@ -304,7 +304,7 @@
 _TEST_EXPORT
 size_t rw_fsize (const char *fname)
 {
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
     // note: both method of obtaining the size of a file
     // just written by a process may fail (i.e., the size
@@ -342,7 +342,7 @@
 
 #  endif   // 0/1
 
-#else   // if !defined (_WIN{32,64})
+#else   // ifndef _WIN32
 
     struct stat sb;
 
@@ -351,7 +351,7 @@
 
     return sb.st_size;
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
 }
 
@@ -481,7 +481,7 @@
 
         *count = 0;
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
 #  ifdef _MSC_VER
         // save the report mode and disable "Invalid file descriptor"
@@ -510,7 +510,7 @@
                 ++*count;
         }
 
-#endif   // WIN{32,64}
+#endif   // _WIN32
 
     }
 

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=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/locale.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/locale.cpp Mon Jun  9 08:42:18 2008
@@ -53,7 +53,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>   // for stat
 
-#if !defined  (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <unistd.h>
 #  include <sys/wait.h>   // for WIFEXITED(), WIFSIGNALED(), WTERMSIG()
 #else
@@ -338,13 +338,13 @@
     // remove temporary file if mkstemp() rw_tmpnam() called mkstemp()
     if (rw_system (SHELL_RM_RF " %s", locale_root)) {
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
         // ignore errors on WIN32 where the stupid DEL command
         // fails even with /Q /S when the files don't exist
 #else
         // assume a sane implementation of SHELL_RM_RF
         return 0;
-#endif   // _WIN{32,64}
+#endif   // _WIN32
     }
 
     if (rw_system ("mkdir %s", locale_root))

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=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/thread.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/thread.cpp Mon Jun  9 08:42:18 2008
@@ -357,7 +357,7 @@
 #      define ENOTSUP     99
 #    elif defined (_RWSTD_OS_SUNOS)
 #      define ENOTSUP     48
-#    elif defined (_WIN32) || defined (_WIN64)
+#    elif defined (_WIN32)
 #      define ENOTSUP ENOSYS
 #    else
 #      define ENOTSUP   9999

Modified: stdcxx/branches/4.2.x/util/cmdopt.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/cmdopt.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/cmdopt.cpp (original)
+++ stdcxx/branches/4.2.x/util/cmdopt.cpp Mon Jun  9 08:42:18 2008
@@ -35,7 +35,7 @@
 #include <stdio.h> /* for *printf, fputs */
 #include <stdlib.h> /* for exit */
 #include <string.h> /* for str* */
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <unistd.h> /* for sleep */
 
 #  if defined (_XOPEN_UNIX)
@@ -44,7 +44,7 @@
 
 #else
 #  include <windows.h> /* for Sleep */
-#endif   /* _WIN{32,64} */
+#endif   /* _WIN32 */
 
 #include "exec.h"
 #include "target.h"

Modified: stdcxx/branches/4.2.x/util/exec.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/exec.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/exec.cpp (original)
+++ stdcxx/branches/4.2.x/util/exec.cpp Mon Jun  9 08:42:18 2008
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <string.h> /* for str*, mem* */
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <unistd.h> /* for close, dup, exec, fork */
 #  include <sys/wait.h>
 #  include <sys/times.h> /* for times - is this XSI? */
@@ -410,7 +410,7 @@
     return def;
 }
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 /**
    Callback used to set the alarm_timeout flag in response to recieving
    the signal SIGALRM
@@ -894,7 +894,7 @@
             warn ("Failed to retrieve start times: %s", strerror (errno));
     }
 }
-#else  /* _WIN{32,64} */
+#else  /* _WIN32 */
 
 // map between NT_STATUS value and corresponding UNIX signal
 static const struct {
@@ -1239,4 +1239,4 @@
     }
 }
 
-#endif  /* _WIN{32,64} */
+#endif  /* _WIN32 */

Modified: stdcxx/branches/4.2.x/util/iconv.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/iconv.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/iconv.cpp (original)
+++ stdcxx/branches/4.2.x/util/iconv.cpp Mon Jun  9 08:42:18 2008
@@ -26,7 +26,7 @@
  * 
  **************************************************************************/
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
 #include <errno.h>
 #include <windows.h>
@@ -348,4 +348,4 @@
     return 0;
 }
 
-#endif   // _WIN{32,64}
+#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=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/memchk.cpp (original)
+++ stdcxx/branches/4.2.x/util/memchk.cpp Mon Jun  9 08:42:18 2008
@@ -85,7 +85,7 @@
 
     if (0 == size) {
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
         SYSTEM_INFO info;
 
@@ -97,7 +97,7 @@
 
         size = getpagesize ();
 
-#endif   // WIN{32,64}
+#endif   // _WIN32
 
     }
 
@@ -116,7 +116,7 @@
         // operation away (as SunOS does, for instance)
         // fd = open ("/dev/null", O_WRONLY);
 
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
         char* const fname = tempnam (P_tmpdir, ".rwmemchk.tmp");
 
@@ -135,7 +135,7 @@
             return size_t (-1);
         }
 
-#else   // !_WIN{32,64}
+#else   // !_WIN32
 
 #  define TMP_TEMPLATE P_tmpdir "/rwmemchk-XXXXXX"
 
@@ -150,7 +150,7 @@
 
         unlink (fname_buf);
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
     }
 

Modified: stdcxx/branches/4.2.x/util/path.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/path.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/path.cpp (original)
+++ stdcxx/branches/4.2.x/util/path.cpp Mon Jun  9 08:42:18 2008
@@ -235,7 +235,7 @@
 
 int makedir (const char *name)
 {
-#if defined (_WIN32) || defined (_WIN64)
+#ifdef _WIN32
 
    if (   0 == CreateDirectory (name, NULL)
         && GetLastError () != ERROR_ALREADY_EXISTS) {
@@ -257,7 +257,7 @@
         return -1;
     }
     
-#else   // if !defined (_WIN{32,64})
+#else   // ifndef _WIN32
 
    if (-1 == mkdir (name, 0755)) {
 
@@ -274,7 +274,7 @@
 
    }
 
-#endif   // _WIN{32,64}
+#endif   // _WIN32
 
     return 0;
 }

Modified: stdcxx/branches/4.2.x/util/runall.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/runall.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/runall.cpp (original)
+++ stdcxx/branches/4.2.x/util/runall.cpp Mon Jun  9 08:42:18 2008
@@ -34,7 +34,7 @@
 #include <limits.h>     /* for PATH_MAX */
 #include <sys/types.h>
 #include <sys/stat.h>
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <sys/wait.h>   /* for WIFEXITED(), ... */
 #endif
 
@@ -397,11 +397,11 @@
     assert (0 != path);
 
     for (mark = pos = path; '\0' != *pos; ++pos)
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
         mark = (default_path_sep == *pos) ? pos + 1 : mark;
 #else
         mark = (default_path_sep == *pos || '/' == *pos) ? pos + 1 : mark;
-#endif   /* _WIN{32,64} */
+#endif   /* _WIN32 */
 
     return mark;
 }

Modified: stdcxx/branches/4.2.x/util/target.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/target.h?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/target.h (original)
+++ stdcxx/branches/4.2.x/util/target.h Mon Jun  9 08:42:18 2008
@@ -29,7 +29,7 @@
 
 #include <time.h> /* for clock_t */
 
-#if !defined (_WIN32) && !defined (_WIN64)
+#ifndef _WIN32
 #  include <unistd.h> /* For _XOPEN_UNIX */
 #endif
 

Modified: stdcxx/branches/4.2.x/util/util.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/util.cpp?rev=665723&r1=665722&r2=665723&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/util.cpp (original)
+++ stdcxx/branches/4.2.x/util/util.cpp Mon Jun  9 08:42:18 2008
@@ -39,7 +39,7 @@
 #  include <unistd.h> /* for sleep() */
 #else
 #  include <windows.h> /* for Sleep() */
-#endif   /* _WIN{32,64} */
+#endif   /* _WIN32 */
 
 
 #include "cmdopt.h" /* for exe_name, target_name */
@@ -297,7 +297,7 @@
 
 #    endif   /* __cplusplus */
 #  endif   /* _RWSTD_EDG_ECCP */
-#else   /* if defined (_WIN32) || defined (_WIN64) */
+#else   /* ifdef _WIN32 */
 
 void
 rw_sleep (int seconds)



Mime
View raw message