mirror of
https://github.com/curl/curl.git
synced 2024-12-09 06:30:06 +08:00
e9a7d4a1c8
Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
92 lines
3.3 KiB
C
92 lines
3.3 KiB
C
#ifndef HEADER_CURL_MULTIBYTE_H
|
|
#define HEADER_CURL_MULTIBYTE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(_WIN32)
|
|
|
|
/*
|
|
* MultiByte conversions using Windows kernel32 library.
|
|
*/
|
|
|
|
wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8);
|
|
char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w);
|
|
#endif /* _WIN32 */
|
|
|
|
/*
|
|
* Macros curlx_convert_UTF8_to_tchar(), curlx_convert_tchar_to_UTF8()
|
|
* and curlx_unicodefree() main purpose is to minimize the number of
|
|
* preprocessor conditional directives needed by code using these
|
|
* to differentiate UNICODE from non-UNICODE builds.
|
|
*
|
|
* In the case of a non-UNICODE build the tchar strings are char strings that
|
|
* are duplicated via strdup and remain in whatever the passed in encoding is,
|
|
* which is assumed to be UTF-8 but may be other encoding. Therefore the
|
|
* significance of the conversion functions is primarily for UNICODE builds.
|
|
*
|
|
* Allocated memory should be free'd with curlx_unicodefree().
|
|
*
|
|
* Note: Because these are curlx functions their memory usage is not tracked
|
|
* by the curl memory tracker memdebug. You'll notice that curlx function-like
|
|
* macros call free and strdup in parentheses, eg (strdup)(ptr), and that's to
|
|
* ensure that the curl memdebug override macros do not replace them.
|
|
*/
|
|
|
|
#if defined(UNICODE) && defined(_WIN32)
|
|
|
|
#define curlx_convert_UTF8_to_tchar(ptr) curlx_convert_UTF8_to_wchar((ptr))
|
|
#define curlx_convert_tchar_to_UTF8(ptr) curlx_convert_wchar_to_UTF8((ptr))
|
|
|
|
typedef union {
|
|
unsigned short *tchar_ptr;
|
|
const unsigned short *const_tchar_ptr;
|
|
unsigned short *tbyte_ptr;
|
|
const unsigned short *const_tbyte_ptr;
|
|
} xcharp_u;
|
|
|
|
#else
|
|
|
|
#define curlx_convert_UTF8_to_tchar(ptr) (strdup)(ptr)
|
|
#define curlx_convert_tchar_to_UTF8(ptr) (strdup)(ptr)
|
|
|
|
typedef union {
|
|
char *tchar_ptr;
|
|
const char *const_tchar_ptr;
|
|
unsigned char *tbyte_ptr;
|
|
const unsigned char *const_tbyte_ptr;
|
|
} xcharp_u;
|
|
|
|
#endif /* UNICODE && _WIN32 */
|
|
|
|
#define curlx_unicodefree(ptr) \
|
|
do { \
|
|
if(ptr) { \
|
|
(free)(ptr); \
|
|
(ptr) = NULL; \
|
|
} \
|
|
} while(0)
|
|
|
|
#endif /* HEADER_CURL_MULTIBYTE_H */
|