svn commit: r590511 - /incubator/stdcxx/trunk/util/util.cpp

[se...@apache.org]

Author: sebor
Date: Tue Oct 30 16:32:14 2007
New Revision: 590511

URL: http://svn.apache.org/viewvc?rev=590511&view=rev
Log:
2007-10-30  Martin Sebor  <se...@roguewave.com>

	Merged rev 590510 (a correction for a fix for STDCXX-414) from
	branches/4.2.x.
	* display.cpp (rw_signal): Guarded with _RWSTD_EDG_ECCP instead
	of _RWSTD_NO_PURE_C_HEADERS as done in rev 588734 since the latter
	is #defined with other compilers including Sun C++ on Linux and it's
	on Linux where rw_signal() must be implemented in terms of sigaction()
	to do what we want.

Modified:
    incubator/stdcxx/trunk/util/util.cpp

Modified: incubator/stdcxx/trunk/util/util.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/util.cpp?rev=590511&r1=590510&r2=590511&view=diff
==============================================================================
--- incubator/stdcxx/trunk/util/util.cpp (original)
+++ incubator/stdcxx/trunk/util/util.cpp Tue Oct 30 16:32:14 2007
@@ -247,7 +247,7 @@
 }
 
 
-#  ifdef _RWSTD_NO_PURE_C_HEADERS
+#  ifndef _RWSTD_EDG_ECCP
 
 #    ifdef __cplusplus
 
@@ -277,7 +277,7 @@
 
 #    endif   /* __cplusplus */
 
-#  else   /* if defined (_RWSTD_NO_PURE_C_HEADERS) */
+#  else   /* if defined (_RWSTD_EDG_ECCP) */
 
 #    ifdef __cplusplus
 
@@ -296,7 +296,7 @@
 }   /* extern "C" */
 
 #    endif   /* __cplusplus */
-#  endif   /* _RWSTD_NO_PURE_C_HEADERS */
+#  endif   /* _RWSTD_EDG_ECCP */
 #else   /* if defined (_WIN32) || defined (_WIN64) */
 
 void