projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Imported Upstream version 7.44.0"
[platform/upstream/curl.git]
/
lib
/
curl_multibyte.h
diff --git
a/lib/curl_multibyte.h
b/lib/curl_multibyte.h
index
dc7ed4c
..
d024755
100644
(file)
--- a/
lib/curl_multibyte.h
+++ b/
lib/curl_multibyte.h
@@
-24,7
+24,7
@@
#include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
#include "curl_setup.h"
#if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
- defined(
USE_WIN32_LDAP
)) && defined(UNICODE))
+ defined(
CURL_LDAP_WIN
)) && defined(UNICODE))
/*
* MultiByte conversions using Windows kernel32 library.
/*
* MultiByte conversions using Windows kernel32 library.
@@
-33,11
+33,11
@@
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8);
char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w);
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8);
char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w);
-#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI ||
USE_WIN32_LDAP
) && UNICODE) */
+#endif /* USE_WIN32_IDN || ((USE_WINDOWS_SSPI ||
CURL_LDAP_WIN
) && UNICODE) */
#if defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI) || \
#if defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI) || \
- defined(
USE_WIN32_LDAP
)
+ defined(
CURL_LDAP_WIN
)
/*
* Macros Curl_convert_UTF8_to_tchar(), Curl_convert_tchar_to_UTF8()
/*
* Macros Curl_convert_UTF8_to_tchar(), Curl_convert_tchar_to_UTF8()
@@
-87,6
+87,6
@@
typedef union {
#endif /* UNICODE */
#endif /* UNICODE */
-#endif /* USE_WIN32_IDN || USE_WINDOWS_SSPI ||
USE_WIN32_LDAP
*/
+#endif /* USE_WIN32_IDN || USE_WINDOWS_SSPI ||
CURL_LDAP_WIN
*/
#endif /* HEADER_CURL_MULTIBYTE_H */
#endif /* HEADER_CURL_MULTIBYTE_H */