mirror of
https://github.com/curl/curl.git
synced 2024-12-09 06:30:06 +08:00
4a5aa6682d
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:
f871de0... build: make use of 76 lib/*.h renamed files
ffd8e12... build: rename 76 lib/*.h files
This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:
c087374... curl_setup.h: remove redundant include guard
This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:
13606bb... build: make use of 93 lib/*.c renamed files
5b6e792... build: rename 93 lib/*.c files
7d83dff... build: commit 13606bbfde follow-up 1
Start of related discussion thread:
http://curl.haxx.se/mail/lib-2013-01/0012.html
Asking for confirmation on pushing this revertion commit:
http://curl.haxx.se/mail/lib-2013-01/0048.html
Confirmation summary:
http://curl.haxx.se/mail/lib-2013-01/0079.html
NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.
lib/curl_imap.h
lib/curl_smtp.h
120 lines
3.6 KiB
C
120 lines
3.6 KiB
C
#ifndef HEADER_CURL_CURLX_H
|
|
#define HEADER_CURL_CURLX_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2008, 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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* Defines protos and includes all header files that provide the curlx_*
|
|
* functions. The curlx_* functions are not part of the libcurl API, but are
|
|
* stand-alone functions whose sources can be built and linked by apps if need
|
|
* be.
|
|
*/
|
|
|
|
#include <curl/mprintf.h>
|
|
/* this is still a public header file that provides the curl_mprintf()
|
|
functions while they still are offered publicly. They will be made library-
|
|
private one day */
|
|
|
|
#include "strequal.h"
|
|
/* "strequal.h" provides the strequal protos */
|
|
|
|
#include "strtoofft.h"
|
|
/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a
|
|
curl_off_t number from a given string.
|
|
*/
|
|
|
|
#include "timeval.h"
|
|
/*
|
|
"timeval.h" sets up a 'struct timeval' even for platforms that otherwise
|
|
don't have one and has protos for these functions:
|
|
|
|
curlx_tvnow()
|
|
curlx_tvdiff()
|
|
curlx_tvdiff_secs()
|
|
*/
|
|
|
|
#include "nonblock.h"
|
|
/* "nonblock.h" provides curlx_nonblock() */
|
|
|
|
#include "warnless.h"
|
|
/* "warnless.h" provides functions:
|
|
|
|
curlx_ultous()
|
|
curlx_ultouc()
|
|
curlx_uztosi()
|
|
*/
|
|
|
|
/* Now setup curlx_ * names for the functions that are to become curlx_ and
|
|
be removed from a future libcurl official API:
|
|
curlx_getenv
|
|
curlx_mprintf (and its variations)
|
|
curlx_strequal
|
|
curlx_strnequal
|
|
|
|
*/
|
|
|
|
#define curlx_getenv curl_getenv
|
|
#define curlx_strequal curl_strequal
|
|
#define curlx_strnequal curl_strnequal
|
|
#define curlx_raw_equal Curl_raw_equal
|
|
#define curlx_mvsnprintf curl_mvsnprintf
|
|
#define curlx_msnprintf curl_msnprintf
|
|
#define curlx_maprintf curl_maprintf
|
|
#define curlx_mvaprintf curl_mvaprintf
|
|
#define curlx_msprintf curl_msprintf
|
|
#define curlx_mprintf curl_mprintf
|
|
#define curlx_mfprintf curl_mfprintf
|
|
#define curlx_mvsprintf curl_mvsprintf
|
|
#define curlx_mvprintf curl_mvprintf
|
|
#define curlx_mvfprintf curl_mvfprintf
|
|
|
|
#ifdef ENABLE_CURLX_PRINTF
|
|
/* If this define is set, we define all "standard" printf() functions to use
|
|
the curlx_* version instead. It makes the source code transparent and
|
|
easier to understand/patch. Undefine them first in case _MPRINTF_REPLACE
|
|
is set. */
|
|
# undef printf
|
|
# undef fprintf
|
|
# undef sprintf
|
|
# undef snprintf
|
|
# undef vprintf
|
|
# undef vfprintf
|
|
# undef vsprintf
|
|
# undef vsnprintf
|
|
# undef aprintf
|
|
# undef vaprintf
|
|
|
|
# define printf curlx_mprintf
|
|
# define fprintf curlx_mfprintf
|
|
# define sprintf curlx_msprintf
|
|
# define snprintf curlx_msnprintf
|
|
# define vprintf curlx_mvprintf
|
|
# define vfprintf curlx_mvfprintf
|
|
# define vsprintf curlx_mvsprintf
|
|
# define vsnprintf curlx_mvsnprintf
|
|
# define aprintf curlx_maprintf
|
|
# define vaprintf curlx_mvaprintf
|
|
#endif /* ENABLE_CURLX_PRINTF */
|
|
|
|
#endif /* HEADER_CURL_CURLX_H */
|
|
|