msvc: add VS2012 CI job, fix compiler warnings in LDAP and tests

Follow-up to 8cfc936f5c9d1fe9a99956a916f95e137476b27c #10674
Follow-up to d620ec67913b2c4be25e7d72f1933f0a8a3e0a2e #14700

Closes #15926

diff --git a/appveyor.yml b/appveyor.yml
index 4e4be0b5165ea8bb010948a7d7d2f66ffa8d46da..ce8fbb28fcea6d2e3105adb7130edaec8229de24 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,6 +61,16 @@ environment:
       ENABLE_UNICODE: 'OFF'
       SHARED: 'ON'
       EXAMPLES: 'ON'
+    - job_name: 'CMake, VS2012, Debug, x64, OpenSSL 1.1.1, Build-only'
+      APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
+      BUILD_SYSTEM: CMake
+      PRJ_GEN: 'Visual Studio 11 2012'
+      TARGET: '-A x64'
+      PRJ_CFG: Debug
+      OPENSSL: 'ON'
+      SCHANNEL: 'OFF'
+      ENABLE_UNICODE: 'OFF'
+      SHARED: 'ON'
     - job_name: 'CMake, VS2013, Debug, x64, OpenSSL 1.1.1, Build-only'
       APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
       BUILD_SYSTEM: CMake

diff --git a/lib/ldap.c b/lib/ldap.c
index 2f9c192fe4c56db85ffe807f7d3c4b90485e5fef..46c5824b9f817d52ee26f986b361cc227aabeacf 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -153,7 +153,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp);
 #define ldap_err2string ldap_err2stringA
 #endif
 
-#if defined(USE_WIN32_LDAP) && defined(_MSC_VER) && (_MSC_VER <= 1600)
+#if defined(USE_WIN32_LDAP) && defined(_MSC_VER) && (_MSC_VER <= 1700)
 /* Workaround for warning:
    'type cast' : conversion from 'int' to 'void *' of greater size */
 #undef LDAP_OPT_ON

diff --git a/tests/server/util.c b/tests/server/util.c
index df9713fb77c027378e69ea0d8bf1a480e54d8b16..c7fe4bbc976fd070a716af8bf4a7af59efe26aad 100644 (file)
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -470,7 +470,7 @@ long timediff(struct timeval newer, struct timeval older)
 
 typedef void (*SIGHANDLER_T)(int);
 
-#if defined(_MSC_VER) && _MSC_VER == 1600
+#if defined(_MSC_VER) && (_MSC_VER <= 1700)
 /* Workaround for warning C4306:
    'type cast' : conversion from 'int' to 'void (__cdecl *)(int)' */
 #undef SIG_ERR