60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From b3995878135b8b7bf4985d5591936b691780174e Mon Sep 17 00:00:00 2001
|
|
From: Luigi 'Comio' Mantellini <luigi.mantellini@gmail.com>
|
|
Date: Mon, 24 Mar 2014 13:43:03 +0100
|
|
Subject: [PATCH] Fix compilation on WIN64 target
|
|
|
|
---
|
|
Foundation/include/Poco/Foundation.h | 4 ++--
|
|
Net/include/Poco/Net/Net.h | 4 ++--
|
|
Net/src/NetworkInterface.cpp | 3 +++
|
|
3 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Foundation/include/Poco/Foundation.h b/Foundation/include/Poco/Foundation.h
|
|
index d2fd0df..dbebf0d 100644
|
|
--- a/Foundation/include/Poco/Foundation.h
|
|
+++ b/Foundation/include/Poco/Foundation.h
|
|
@@ -66,7 +66,7 @@
|
|
// Foundation_API functions as being imported from a DLL, wheras this DLL sees symbols
|
|
// defined with this macro as being exported.
|
|
//
|
|
-#if (defined(_WIN32) || defined(_WIN32_WCE)) && defined(POCO_DLL)
|
|
+#if (defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && defined(POCO_DLL)
|
|
#if defined(Foundation_EXPORTS)
|
|
#define Foundation_API __declspec(dllexport)
|
|
#else
|
|
@@ -118,7 +118,7 @@
|
|
// Include platform-specific definitions
|
|
//
|
|
#include "Poco/Platform.h"
|
|
-#if defined(_WIN32)
|
|
+#if defined(_WIN32) || defined(_WIN64)
|
|
#include "Poco/Platform_WIN32.h"
|
|
#elif defined(__VMS)
|
|
#include "Poco/Platform_VMS.h"
|
|
diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h
|
|
index dcfad07..b7866fa 100644
|
|
--- a/Net/include/Poco/Net/Net.h
|
|
+++ b/Net/include/Poco/Net/Net.h
|
|
@@ -53,7 +53,7 @@
|
|
// Net_API functions as being imported from a DLL, wheras this DLL sees symbols
|
|
// defined with this macro as being exported.
|
|
//
|
|
-#if defined(_WIN32) && defined(POCO_DLL)
|
|
+#if (defined(_WIN32) || defined(_WIN64)) && defined(POCO_DLL)
|
|
#if defined(Net_EXPORTS)
|
|
#define Net_API __declspec(dllexport)
|
|
#else
|
|
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
|
|
index c84e2d6..c65fa8d 100644
|
|
--- a/Net/src/NetworkInterface.cpp
|
|
+++ b/Net/src/NetworkInterface.cpp
|
|
@@ -50,6 +50,8 @@
|
|
#include "Poco/UnicodeConverter.h"
|
|
#endif
|
|
#include "Poco/Error.h"
|
|
+ #include <winsock2.h>
|
|
+ #include <ws2ipdef.h>
|
|
#include <wincrypt.h>
|
|
#include <iphlpapi.h>
|
|
#include <ipifcons.h>
|