From 882a51b75ce44b5e09d99b74fd1cf5365fdb847c Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Wed, 27 Jun 2012 15:39:29 +0300
Subject: [PATCH] Fix Botan build with msvc

Change-Id: I516e9e4a3a267bcaf17038cd79298358d93d0ec0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
 src/libs/3rdparty/botan/botan.cpp |  9 ++-------
 src/libs/3rdparty/botan/botan.h   |  8 +++-----
 src/libs/3rdparty/botan/botan.pro | 13 +++++++------
 src/libs/3rdparty/botan/botan.qbs |  6 +++---
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
index c865a4db84e..ce11938e0fa 100644
--- a/src/libs/3rdparty/botan/botan.cpp
+++ b/src/libs/3rdparty/botan/botan.cpp
@@ -5,7 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <QtGlobal>
+#include "botan.h"
+#include <deque>
 
 #ifdef Q_OS_WIN
 #ifndef NOMINMAX
@@ -13,12 +14,6 @@
 #endif
 #endif
 
-#include "botan.h"
-#include <map>
-#include <vector>
-#include <string>
-#include <deque>
-#include <utility>
 
 namespace Botan {
 
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
index 51e411dc333..a073890986c 100644
--- a/src/libs/3rdparty/botan/botan.h
+++ b/src/libs/3rdparty/botan/botan.h
@@ -8,6 +8,8 @@
 #ifndef BOTAN_AMALGAMATION_H__
 #define BOTAN_AMALGAMATION_H__
 
+#include <QtGlobal>
+
 #include <iosfwd>
 #include <map>
 #include <exception>
@@ -28,11 +30,7 @@
 #define BOTAN_DISTRIBUTION_INFO "unspecified"
 
 #ifndef BOTAN_DLL
-#ifdef Q_OS_WIN
-    #define BOTAN_DLL __declspec(dllimport)
-#else
-    #define BOTAN_DLL __attribute__((visibility("default")))
-#endif
+#define BOTAN_DLL Q_DECL_IMPORT
 #endif
 
 /* Chunk sizes */
diff --git a/src/libs/3rdparty/botan/botan.pro b/src/libs/3rdparty/botan/botan.pro
index 1126f15ce17..f4c0d2286a9 100644
--- a/src/libs/3rdparty/botan/botan.pro
+++ b/src/libs/3rdparty/botan/botan.pro
@@ -11,17 +11,18 @@ DEPENDPATH += .
 INCLUDEPATH += .
 unix:QMAKE_CXXFLAGS_DEBUG += -O2
 
-unix:DEFINES+=BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
+DEFINES += BOTAN_DLL=Q_DECL_EXPORT
+unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
     BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
     BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
-*linux*:DEFINES+=BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
+*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
     BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
     BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
-macx:DEFINES+=BOTAN_TARGET_OS_IS_DARWIN
-*g++*:DEFINES+=BOTAN_BUILD_COMPILER_IS_GCC
+macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
+*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
 
 win32 {
-    DEFINES+=BOTAN_TARGET_OS_IS_WINDOWS BOTAN_TARGET_OS_HAS_GMTIME_S \
+    DEFINES += BOTAN_TARGET_OS_IS_WINDOWS BOTAN_TARGET_OS_HAS_GMTIME_S \
         BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
         BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
         BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
@@ -29,7 +30,7 @@ win32 {
 
     win32-msvc* {
         QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
-        DEFINES += BOTAN_DLL=__declspec(dllexport) BOTAN_BUILD_COMPILER_IS_MSVC
+        DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC
     } else {
         QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
         QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index 7520efc370a..b021d29b5f0 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -20,9 +20,9 @@ QtcLibrary {
     }
 
     cpp.defines: {
-        var result = []
-        if (qbs.toolchain == "msvc2005" || qbs.toolchain == "msvc2008" || qbs.toolchain == "msvc2010")
-            result.push("BOTAN_DLL=__declspec(dllexport)", "BOTAN_BUILD_COMPILER_IS_MSVC")
+        var result = ["BOTAN_DLL=Q_DECL_EXPORT"]
+        if (qbs.toolchain == "msvc")
+            result.push("BOTAN_BUILD_COMPILER_IS_MSVC")
         if (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")
             result.push("BOTAN_BUILD_COMPILER_IS_GCC")
         if (qbs.targetOS == "linux")