diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-02 08:06:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-02 20:40:21 +0000 |
| commit | 0c9ddb24ee0388d03c313caf5a45f1aa26049781 (patch) | |
| tree | e91e799f21aa940e80bf8f59733ec6f7e6efc37b /include/systools | |
| parent | ed7d22049596ac91ad75bfad1a5675c13714e203 (diff) | |
Don't redefine snprintf as VS 2015 supports ISO standard
Make the workaround in snprintf.h conditional on older MSVC version.
Investigation reveals that the GetShortPathNameW is presumably used by
legacy Duden extension that was built by Sun in a setsolar environment.
The uwinapi.lib was never part of the SDK, so ordinary extensions cannot
link against it. The PRIVATE export of the symbol that is only possible
with DEF file therefore does not matter much. With VC2015 there is no
need for LO code to use uwinapi.dll at all and gb_UWINAPI can be unset
in this case.
Change-Id: I23a5636db9431b0fa4350b665a6a69613d625264
Reviewed-on: https://gerrit.libreoffice.org/16677
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/systools')
| -rw-r--r-- | include/systools/win32/snprintf.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/systools/win32/snprintf.h b/include/systools/win32/snprintf.h index 92e571f91ee8..62abfc8a11a6 100644 --- a/include/systools/win32/snprintf.h +++ b/include/systools/win32/snprintf.h @@ -69,6 +69,9 @@ extern "C" { #if !defined(__MINGW32__) || defined (__NO_ISOCEXT) +/* VS 2015 and above support ISO C snprintf */ +#if _MSC_VER < 1900 + /* UNICODE version */ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... ); @@ -77,6 +80,8 @@ _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char #endif +#endif + /* Conflict with STL_port inline implementation */ #ifdef __cplusplus |