bzr push into mysql-trunk branch (marc.alff:3391 to 3392)

[Marc Alff]

 3392 Marc Alff	2011-08-19
      Removed unexplained diff with trunk

    modified:
      config.h.cmake
 3391 Marc Alff	2011-08-19 [merge]
      Merge mysql-trunk --> mysql-trunk-wl4896

    modified:
      extra/yassl/src/yassl_int.cpp
=== modified file 'config.h.cmake'
--- a/config.h.cmake	2011-07-22 20:08:29 +0000
+++ b/config.h.cmake	2011-08-19 16:39:54 +0000
@@ -614,21 +614,6 @@
 #define VERSION "@VERSION@"
 #define PROTOCOL_VERSION 10
 
-#ifdef _WIN32
-#if (_MSC_VER < 1500)
-  typedef struct _RTL_CONDITION_VARIABLE
-  {
-    void* Ptr;
-  } RTL_CONDITION_VARIABLE, *PRTL_CONDITION_VARIABLE;
-  typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE;
-  typedef struct _RTL_SRWLOCK
-  {
-    void* Ptr;
-  } RTL_SRWLOCK, *PRTL_SRWLOCK;
-  typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
-#endif
-#endif
-
 
 /* time_t related defines */
 

No bundle (reason: useless for push emails).