From 28e153c99d1c067a8bcbbabf3cd0c02e7150aee8 Mon Sep 17 00:00:00 2001 From: hairball Date: Sat, 8 Feb 2014 17:33:56 +0000 Subject: Upgrade from libcurl 7.15.5 (2006-08-07) to 7.35.0 (2014-01-29) Note: This uses the generic curlbuild.h because it is used by multiple platforms. A system curl would have a configure generated one. The libraries for win32 and win64 were cross compiled with these options: --disable-shared --enable-static --disable-ares --enable-http \ --enable-ftp --disable-ldap --disable-ldaps --disable-rtsp \ --disable-dict --disable-file --disable-telnet --disable-tftp \ --disable-pop3 --disable-imap --disable-smtp --disable-gopher \ --enable-ipv6 --without-ssl \ --disable-manual --disable-libcurl-option This effectively enables only HTTP and FTP protocol support. --- src/libcurl/curl/mprintf.h | 62 ---------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 src/libcurl/curl/mprintf.h (limited to 'src/libcurl/curl/mprintf.h') diff --git a/src/libcurl/curl/mprintf.h b/src/libcurl/curl/mprintf.h deleted file mode 100644 index 8d835f13..00000000 --- a/src/libcurl/curl/mprintf.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef __CURL_MPRINTF_H -#define __CURL_MPRINTF_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2006, Daniel Stenberg, , 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. - * - * $Id: mprintf.h,v 1.13 2006-03-28 10:08:54 bagder Exp $ - ***************************************************************************/ - -#include -#include /* needed for FILE */ - -#include "curl.h" - -CURL_EXTERN int curl_mprintf(const char *format, ...); -CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...); -CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...); -CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...); -CURL_EXTERN int curl_mvprintf(const char *format, va_list args); -CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args); -CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args); -CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args); -CURL_EXTERN char *curl_maprintf(const char *format, ...); -CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args); - -#ifdef _MPRINTF_REPLACE -# define printf curl_mprintf -# define fprintf curl_mfprintf -#ifdef CURLDEBUG -/* When built with CURLDEBUG we define away the sprintf() functions since we - don't want internal code to be using them */ -# define sprintf sprintf_was_used -# define vsprintf vsprintf_was_used -#else -# define sprintf curl_msprintf -# define vsprintf curl_mvsprintf -#endif -# define snprintf curl_msnprintf -# define vprintf curl_mvprintf -# define vfprintf curl_mvfprintf -# define vsnprintf curl_mvsnprintf -# define aprintf curl_maprintf -# define vaprintf curl_mvaprintf -#endif - -#endif /* __CURL_MPRINTF_H */ -- cgit