stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r673067 - in /stdcxx/branches/4.2.x/include/rw: _config-msvcrt.h _mutex.h
Date Tue, 01 Jul 2008 12:27:19 GMT
Author: faridz
Date: Tue Jul  1 05:27:19 2008
New Revision: 673067

URL: http://svn.apache.org/viewvc?rev=673067&view=rev
Log:
2008-07-01  Farid Zaripov  <faridz@apache.com>

	* include/rw/_config-msvcrt.h [_WIN64]: Don't #define
	_RWSTD_NO_FWD_DECLARATIONS since the present forward
	declarations are working fine on _WIN64.
	* include/rw/_mutex.h [_WIN32 && _RWSTD_NO_FWD_DECLARATIONS]:
	Reverted changes from r671547.

Modified:
    stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
    stdcxx/branches/4.2.x/include/rw/_mutex.h

Modified: stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h?rev=673067&r1=673066&r2=673067&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h Tue Jul  1 05:27:19 2008
@@ -93,11 +93,6 @@
 #  define _RWSTD_LONG_LONG __int64
 #endif   // _MSC_VER <= 1300 || _RWSTD_NO_LONG_LONG
 
-#if defined (_WIN64)
-     // FIXME: handle by forward declaring fuctions in <rw/_mutex.h>
-#  define _RWSTD_NO_FWD_DECLARATIONS
-#endif   // _WIN64
-
 #if defined (WIN32) && !defined(_WIN32)
 #  define _WIN32
 #endif

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=673067&r1=673066&r2=673067&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/rw/_mutex.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_mutex.h Tue Jul  1 05:27:19 2008
@@ -124,14 +124,13 @@
 
 #  ifdef _RWSTD_NO_FWD_DECLARATIONS
 
-     // prevent #including unneeded headers, i.e. <winsock.h> because
-     // this causes the error "WinSock.h has already been included"
+     // #including <windows.h> without WIN32_LEAN_AND_MEAN macro defined
+     // may cause an errors "WinSock.h has already been included"
      // when <winsock2.h> has been included after this header
-#    define WIN32_LEAN_AND_MEAN
 #    include <windows.h>
 #    define _RWSTD_MUTEX_T _RTL_CRITICAL_SECTION
 
-#  else   // if defined (_RWSTD_NO_FWD_DECLARATIONS)
+#  else   // if !defined (_RWSTD_NO_FWD_DECLARATIONS)
 
    // avoid #including this header (MFC doesn't like it)
    // #  include <windows.h>



Mime
View raw message