[[ LC 6.7.4-rc-1 ]] Backport Windows server compilation issues fixed in develop-7.0

livecodemichael · livecodemichael · commit 6480dfc843fc · 2015-02-27T15:46:24.000Z
diff --git a/revdb/src/dbdrivercommon.cpp b/revdb/src/dbdrivercommon.cpp
@@ -16,7 +16,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "dbdrivercommon.h"
 
-#if defined(_WINDOWS)
+#if defined(_WINDOWS) || defined(_WINDOWS_SERVER)
 #define LIBRARY_EXPORT __declspec(dllexport)
 #elif defined(_MACOSX)
 #define LIBRARY_EXPORT
diff --git a/revdb/src/revdb.cpp b/revdb/src/revdb.cpp
@@ -280,7 +280,7 @@ DATABASEREC *LoadDatabaseDriverFromName(const char *p_type)
     t_result = new DATABASEREC;
 #if (defined _MACOSX && !defined _MAC_SERVER)
     t_result -> driverref = (CFBundleRef)t_handle;
-#elif (defined _WINDOWS)
+#elif (defined _WINDOWS) || defined _WINDOWS_SERVER
     t_result -> driverref = (HINSTANCE)t_handle;
 #else
 	t_result -> driverref = t_handle;
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 3d76c8a1c91fda304be3109d68d6892151a1bc55
+Subproject commit a35e1290325a0141c4fe9a539d5756426c27d45b
