mirror of
https://github.com/moparisthebest/curl
synced 2024-11-13 21:15:08 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
91 lines
3.1 KiB
C
91 lines
3.1 KiB
C
#ifndef HEADER_CURL_MULTIBYTE_H
|
|
#define HEADER_CURL_MULTIBYTE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
|
|
|
|
/*
|
|
* MultiByte conversions using Windows kernel32 library.
|
|
*/
|
|
|
|
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 && UNICODE) */
|
|
|
|
|
|
#if defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI)
|
|
|
|
/*
|
|
* Macros Curl_convert_UTF8_to_tchar(), Curl_convert_tchar_to_UTF8()
|
|
* and Curl_unicodefree() main purpose is to minimize the number of
|
|
* preprocessor conditional directives needed by code using these
|
|
* to differentiate UNICODE from non-UNICODE builds.
|
|
*
|
|
* When building with UNICODE defined, this two macros
|
|
* Curl_convert_UTF8_to_tchar() and Curl_convert_tchar_to_UTF8()
|
|
* return a pointer to a newly allocated memory area holding result.
|
|
* When the result is no longer needed, allocated memory is intended
|
|
* to be free'ed with Curl_unicodefree().
|
|
*
|
|
* When building without UNICODE defined, this macros
|
|
* Curl_convert_UTF8_to_tchar() and Curl_convert_tchar_to_UTF8()
|
|
* return the pointer received as argument. Curl_unicodefree() does
|
|
* no actual free'ing of this pointer it is simply set to NULL.
|
|
*/
|
|
|
|
#ifdef UNICODE
|
|
|
|
#define Curl_convert_UTF8_to_tchar(ptr) Curl_convert_UTF8_to_wchar((ptr))
|
|
#define Curl_convert_tchar_to_UTF8(ptr) Curl_convert_wchar_to_UTF8((ptr))
|
|
#define Curl_unicodefree(ptr) \
|
|
do {if((ptr)) {free((ptr)); (ptr) = NULL;}} WHILE_FALSE
|
|
|
|
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 Curl_convert_UTF8_to_tchar(ptr) (ptr)
|
|
#define Curl_convert_tchar_to_UTF8(ptr) (ptr)
|
|
#define Curl_unicodefree(ptr) \
|
|
do {(ptr) = NULL;} WHILE_FALSE
|
|
|
|
typedef union {
|
|
char *tchar_ptr;
|
|
const char *const_tchar_ptr;
|
|
unsigned char *tbyte_ptr;
|
|
const unsigned char *const_tbyte_ptr;
|
|
} xcharp_u;
|
|
|
|
#endif /* UNICODE */
|
|
|
|
#endif /* USE_WIN32_IDN || USE_WINDOWS_SSPI */
|
|
|
|
#endif /* HEADER_CURL_MULTIBYTE_H */
|