From 6a89842e3642729fbac20a92a1655452f4d45487 Mon Sep 17 00:00:00 2001
From: Staale Smedseng <staale.smedseng@sun.com>
Date: Wed, 23 Sep 2009 15:21:29 +0200
Subject: Bug #43414 Parenthesis (and other) warnings compiling MySQL with gcc
 4.3.2

Cleaning up warnings not present in 5.0.
---
 extra/yassl/include/yassl_int.hpp | 2 +-
 extra/yassl/src/yassl_int.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'extra')

diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp
index d18dc41860c..1e761f559e2 100644
--- a/extra/yassl/include/yassl_int.hpp
+++ b/extra/yassl/include/yassl_int.hpp
@@ -441,7 +441,7 @@ public:
     const Ciphers&    GetCiphers()  const;
     const DH_Parms&   GetDH_Parms() const;
     const Stats&      GetStats()    const;
-    const VerifyCallback getVerifyCallback() const;
+    VerifyCallback    getVerifyCallback() const;
     pem_password_cb   GetPasswordCb() const;
           void*       GetUserData()   const;
           bool        GetSessionCacheOff() const;
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index b7f91d72166..8e4a9aa95ec 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -1833,7 +1833,7 @@ SSL_CTX::GetCA_List() const
 }
 
 
-const VerifyCallback SSL_CTX::getVerifyCallback() const
+VerifyCallback SSL_CTX::getVerifyCallback() const
 {
     return verifyCallback_;
 }
-- 
cgit v1.2.1


From 6ff8f716c3cfae2e9e54ff71a06b16da89d94b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Bl=C3=A5udd?= <magnus.blaudd@sun.com>
Date: Tue, 6 Oct 2009 18:10:34 +0200
Subject: Bug#47867 compiler warning _WIN32_WINNT macro redefinition  - Remove
 the conflicting macro definitions since we define a higher value    directly
 in the cmake files.

---
 extra/yassl/taocrypt/src/random.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'extra')

diff --git a/extra/yassl/taocrypt/src/random.cpp b/extra/yassl/taocrypt/src/random.cpp
index 89fd5f7c7bc..2bbc0a85e8b 100644
--- a/extra/yassl/taocrypt/src/random.cpp
+++ b/extra/yassl/taocrypt/src/random.cpp
@@ -27,7 +27,6 @@
 #include <time.h>
 
 #if defined(_WIN32)
-    #define _WIN32_WINNT 0x0400
     #include <windows.h>
     #include <wincrypt.h>
 #else
-- 
cgit v1.2.1