402N/A--- stdcxx-4.2.1/tests/localization/22.locale.messages.cpp 2008-04-24 20:23:10.000000000 -0400

402N/A+++ stdcxx-4.2.1/tests/localization/22.locale.messages.cpp 2009-03-28 01:09:14.686728000 -0400

402N/A@@ -51,6 +51,11 @@

402N/A # include <unistd.h> // for getcwd()

402N/A # endif

402N/A # include <fcntl.h> // for mode flags for _open

402N/A+#else

402N/A+# include <sys/types.h>

402N/A+# include <sys/stat.h>

402N/A+# include <unistd.h> // for getcwd()

402N/A+# include <fcntl.h> // for mode flags for _open

402N/A #endif // _RWSTD_NO_NEW_HEADER

402N/A

402N/A #undef open

402N/A@@ -695,7 +700,7 @@

402N/A std::messages_base::catalog cats [NCATS];

402N/A

402N/A // detect descriptor leaks

402N/A- const int fd1 = open (__FILE__, O_RDONLY);

402N/A+ const int fd1 = open (__FILE__, _RWSTD_O_RDONLY);

402N/A

402N/A const std::locale loc = std::locale::classic ();

402N/A

402N/A@@ -731,7 +736,7 @@

402N/A close_catalog (msgs, cats [i], false, cname, __LINE__);

402N/A }

402N/A

402N/A- int fd2 = open (__FILE__, O_RDONLY);

402N/A+ int fd2 = open (__FILE__, _RWSTD_O_RDONLY);

402N/A rw_assert (fd2 - fd1 == 1, 0, __LINE__,

402N/A "messages<%s>::close() leaked %d file descriptors",

402N/A cname, fd2 - fd1 - 1);

402N/A@@ -750,7 +755,7 @@

402N/A // close again fd2

402N/A close (fd2);

402N/A

402N/A- fd2 = open (__FILE__, O_RDONLY);

402N/A+ fd2 = open (__FILE__, _RWSTD_O_RDONLY);

402N/A rw_assert (fd2 - fd1 == 1, 0, __LINE__,

402N/A "messages<%s>::close() leaked %d file descriptors",

402N/A cname, fd2 - fd1 - 1);