91e8d35ab8
Resolve conflicts by taking upstream side when possible and otherwise integrating the changes from both sides. Be carful in CMakeLists.txt where the OPENSSL code block that we modified previously has moved, and preserve our previous modifications in the new location.
57 lines
1.8 KiB
C
57 lines
1.8 KiB
C
#ifndef HEADER_CURL_PRINTF_H
|
|
#define HEADER_CURL_PRINTF_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* 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
|
|
* 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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* This header should be included by ALL code in libcurl that uses any
|
|
* *rintf() functions.
|
|
*/
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
# undef printf
|
|
# undef fprintf
|
|
# undef snprintf
|
|
# undef vprintf
|
|
# undef vfprintf
|
|
# undef vsnprintf
|
|
# undef aprintf
|
|
# undef vaprintf
|
|
# define printf curl_mprintf
|
|
# define fprintf curl_mfprintf
|
|
# define snprintf curl_msnprintf
|
|
# define vprintf curl_mvprintf
|
|
# define vfprintf curl_mvfprintf
|
|
# define vsnprintf curl_mvsnprintf
|
|
# define aprintf curl_maprintf
|
|
# define vaprintf curl_mvaprintf
|
|
|
|
/* We define away the sprintf functions unconditonally since we don't want
|
|
internal code to be using them, intentionally or by mistake!*/
|
|
# undef sprintf
|
|
# undef vsprintf
|
|
# define sprintf sprintf_was_used
|
|
# define vsprintf vsprintf_was_used
|
|
|
|
#endif /* HEADER_CURL_PRINTF_H */
|