diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 11:11:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 21:48:22 +0100 |
| commit | c7efa4fd4f57fd4e0a46d1aee9a9f0f0652bb67b (patch) | |
| tree | cd449a7f593a629582e2beddb39a474f18b60be4 /external | |
| parent | 83ff5b784e910f06c9d8384ac73a1c0bda0551d5 (diff) | |
external/firebird: Fix MSVC /Zc:strictStrings
> C:/lo/core/workdir/UnpackedTarball/firebird/src/auth/trusted/AuthSspi.cpp(112): error C2664: 'SECURITY_STATUS (SEC_CHAR *,SEC_CHAR *,unsigned long,void *,void *,SEC_GET_KEY_FN,void *,PCredHandle,PTimeStamp)': cannot convert argument 2 from 'const char [5]' to 'SEC_CHAR *'
> C:/lo/core/workdir/UnpackedTarball/firebird/src/auth/trusted/AuthSspi.cpp(112): note: Conversion from string literal loses const qualifier (see /Zc:strictStrings)
Not sure why this only started to hit my build now.
Change-Id: Idea0a8a2abaafe17183323a31f29173bd71fbeec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rwxr-xr-x | external/firebird/msvc.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 4fc27396429a..fef0b7fe48b1 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -43,6 +43,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-307.patch.1 \ external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \ external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 \ + external/firebird/msvc.patch \ )) ifeq ($(OS),WNT) diff --git a/external/firebird/msvc.patch b/external/firebird/msvc.patch new file mode 100755 index 000000000000..3f403b496098 --- /dev/null +++ b/external/firebird/msvc.patch @@ -0,0 +1,11 @@ +--- src/auth/trusted/AuthSspi.cpp ++++ src/auth/trusted/AuthSspi.cpp +@@ -109,7 +109,7 @@ + groupNames(*getDefaultMemoryPool()), sessionKey(*getDefaultMemoryPool()) + { + TimeStamp timeOut; +- hasCredentials = initEntries() && (fAcquireCredentialsHandle(0, "NTLM", ++ hasCredentials = initEntries() && (fAcquireCredentialsHandle(0, const_cast<char *>("NTLM"), + SECPKG_CRED_BOTH, 0, 0, 0, 0, + &secHndl, &timeOut) == SEC_E_OK); + } |