diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-01-03 21:54:11 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-01-04 22:19:30 +0000 |
| commit | ea93252ef1cb3dba44312ceec824d6436c54aa08 (patch) | |
| tree | 16a06478687eedcbbabe2abe54775416709f0cff /lib/curl_multibyte.c | |
| parent | f6b168de4cb28337e63d68aaea255416d10f46b0 (diff) | |
| download | curl-ea93252ef1cb3dba44312ceec824d6436c54aa08.tar.gz | |
ldap: Fixed Unicode usage for all Win32 builds
Otherwise, the fixes in the previous commits would only be applicable
to IDN and SSPI based builds and not others such as OpenSSL with LDAP
enabled.
Diffstat (limited to 'lib/curl_multibyte.c')
| -rw-r--r-- | lib/curl_multibyte.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c index 6c02239eb..6e657228c 100644 --- a/lib/curl_multibyte.c +++ b/lib/curl_multibyte.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -22,7 +22,8 @@ #include "curl_setup.h" -#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) +#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \ + defined(CURL_LDAP_WIN)) && defined(UNICODE)) /* * MultiByte conversions using Windows kernel32 library. @@ -79,4 +80,4 @@ char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w) return str_utf8; } -#endif /* USE_WIN32_IDN || (USE_WINDOWS_SSPI && UNICODE) */ +#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI || CURL_LDAP_WIN) && UNICODE) */ |