Author: sebor Date: Sat Feb 14 22:54:58 2009 New Revision: 744581 URL: http://svn.apache.org/viewvc?rev=744581&view=rev Log: 2009-02-14 Martin Sebor <se...@roguewave.com>
STDCXX-1029 * etc/config/src/UNISTD_DECL.cpp: Reverted rev 731368 using the 'svn merge -r731368:731367 .' command. * src/setlocale.cpp: Reverted rev 731371. * src/locale_core.cpp: Same. * src/mman.cpp: Same. * src/file.cpp: Same. * tests/src/file.cpp: Reverted 731374. * tests/src/locale.cpp: Same. Modified: stdcxx/branches/4.2.x/etc/config/src/UNISTD_DECL.cpp stdcxx/branches/4.2.x/src/file.cpp stdcxx/branches/4.2.x/src/locale_core.cpp stdcxx/branches/4.2.x/src/mman.cpp stdcxx/branches/4.2.x/src/setlocale.cpp stdcxx/branches/4.2.x/tests/src/file.cpp stdcxx/branches/4.2.x/tests/src/locale.cpp 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=744581&r1=744580&r2=744581&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 Sat Feb 14 22:54:58 2009 @@ -24,12 +24,6 @@ #include "config.h" -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux - #include <sys/types.h> #include <fcntl.h> #include <stdio.h> Modified: stdcxx/branches/4.2.x/src/file.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/file.cpp?rev=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/src/file.cpp (original) +++ stdcxx/branches/4.2.x/src/file.cpp Sat Feb 14 22:54:58 2009 @@ -37,12 +37,6 @@ # define _RWSTD_NO_DEPRECATED_C_HEADERS #endif // _RWSTD_NO_DEPRECATED_C_HEADERS -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux - #include <errno.h> // for ENAMETOOLONG, ERANGE, errno #include <stddef.h> // for ptrdiff_t #include <stdio.h> // for P_tmpdir, std{err,in,out}, remove(), tmpnam() Modified: stdcxx/branches/4.2.x/src/locale_core.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_core.cpp?rev=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/src/locale_core.cpp (original) +++ stdcxx/branches/4.2.x/src/locale_core.cpp Sat Feb 14 22:54:58 2009 @@ -30,12 +30,6 @@ #include <rw/_defs.h> -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux - #ifdef __SUNPRO_CC // working around SunPro bug 568 # include <time.h> Modified: stdcxx/branches/4.2.x/src/mman.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/mman.cpp?rev=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/src/mman.cpp (original) +++ stdcxx/branches/4.2.x/src/mman.cpp Sat Feb 14 22:54:58 2009 @@ -29,12 +29,6 @@ #define _RWSTD_LIB_SRC #include <rw/_defs.h> -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux - #ifndef _MSC_VER // <unistd.h> is included here because of PR #26255 # include <unistd.h> Modified: stdcxx/branches/4.2.x/src/setlocale.cpp URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/setlocale.cpp?rev=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/src/setlocale.cpp (original) +++ stdcxx/branches/4.2.x/src/setlocale.cpp Sat Feb 14 22:54:58 2009 @@ -33,12 +33,6 @@ #include <rw/_defs.h> -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux - #if defined (__linux__) && !defined (_XOPEN_SOURCE) // need S_IFDIR on Linux # define _XOPEN_SOURCE 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=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/tests/src/file.cpp (original) +++ stdcxx/branches/4.2.x/tests/src/file.cpp Sat Feb 14 22:54:58 2009 @@ -32,12 +32,6 @@ #include <rw_file.h> #ifdef _RWSTD_OS_LINUX -# if 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -# endif // gcc 4.3 - # ifdef _RWSTD_NO_PURE_C_HEADERS // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h> // (avoid this hackery when using pure "C' headers (i.e., with the EDG 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=744581&r1=744580&r2=744581&view=diff ============================================================================== --- stdcxx/branches/4.2.x/tests/src/locale.cpp (original) +++ stdcxx/branches/4.2.x/tests/src/locale.cpp Sat Feb 14 22:54:58 2009 @@ -29,11 +29,6 @@ // expand _TEST_EXPORT macros #define _RWSTD_TEST_SRC -#if defined __linux__ && 4 == __GNUC__ && 3 == __GNUC_MINOR__ - // work around gcc bug 37405 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37405 -# define __wur /* empty */ -#endif // gcc 4.3 on Linux #include <rw_locale.h> #include <rw_environ.h> // for rw_putenv()