mirror of https://github.com/moparisthebest/curl
Renamed easy.h and multi.h to easyif.h and multiif.h to make sure they don't
shadow our public headers with the former names.
This commit is contained in:
parent
a1813e2b2d
commit
e3fa7d021e
|
@ -17,4 +17,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
|
||||||
http_chunks.h strtok.h connect.h llist.h hash.h content_encoding.h \
|
http_chunks.h strtok.h connect.h llist.h hash.h content_encoding.h \
|
||||||
share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h \
|
share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h \
|
||||||
inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h \
|
inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h \
|
||||||
setup.h transfer.h select.h
|
setup.h transfer.h select.h easyif.h multiif.h
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
#include "share.h"
|
#include "share.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "progress.h"
|
#include "progress.h"
|
||||||
#include "easy.h"
|
#include "easyif.h"
|
||||||
|
|
||||||
#define _MPRINTF_REPLACE /* use our functions only */
|
#define _MPRINTF_REPLACE /* use our functions only */
|
||||||
#include <curl/mprintf.h>
|
#include <curl/mprintf.h>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef __EASY_H
|
#ifndef __EASYIF_H
|
||||||
#define __EASY_H
|
#define __EASYIF_H
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* _ _ ____ _
|
* _ _ ____ _
|
||||||
* Project ___| | | | _ \| |
|
* Project ___| | | | _ \| |
|
||||||
|
@ -23,13 +23,9 @@
|
||||||
* $Id$
|
* $Id$
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* This file shadows for <curl/easy.h> in some compilers
|
|
||||||
*/
|
|
||||||
#include <curl/easy.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Prototypes for library-wide functions provided by easy.c
|
* Prototypes for library-wide functions provided by easy.c
|
||||||
*/
|
*/
|
||||||
void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
|
void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
|
||||||
|
|
||||||
#endif /* __EASY_H */
|
#endif /* __EASYIF_H */
|
|
@ -43,8 +43,8 @@
|
||||||
#include "connect.h"
|
#include "connect.h"
|
||||||
#include "progress.h"
|
#include "progress.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "easy.h"
|
#include "easyif.h"
|
||||||
#include "multi.h"
|
#include "multiif.h"
|
||||||
|
|
||||||
/* The last #include file should be: */
|
/* The last #include file should be: */
|
||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef __MULTI_H
|
#ifndef __MULTIIF_H
|
||||||
#define __MULTI_H
|
#define __MULTIIF_H
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* _ _ ____ _
|
* _ _ ____ _
|
||||||
* Project ___| | | | _ \| |
|
* Project ___| | | | _ \| |
|
||||||
|
@ -23,13 +23,9 @@
|
||||||
* $Id$
|
* $Id$
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
/* This file shadows for <curl/multi.h> in some compilers
|
|
||||||
*/
|
|
||||||
#include <curl/multi.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Prototypes for library-wide functions provided by multi.c
|
* Prototypes for library-wide functions provided by multi.c
|
||||||
*/
|
*/
|
||||||
void Curl_multi_rmeasy(void *multi, CURL *data);
|
void Curl_multi_rmeasy(void *multi, CURL *data);
|
||||||
|
|
||||||
#endif /* __MULTI_H */
|
#endif /* __MULTIIF_H */
|
|
@ -31,7 +31,6 @@
|
||||||
#include <idna.h>
|
#include <idna.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "multi.h"
|
|
||||||
#include "strerror.h"
|
#include "strerror.h"
|
||||||
|
|
||||||
#define _MPRINTF_REPLACE /* use our functions only */
|
#define _MPRINTF_REPLACE /* use our functions only */
|
||||||
|
|
|
@ -118,7 +118,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
|
||||||
#include "http_digest.h"
|
#include "http_digest.h"
|
||||||
#include "http_negotiate.h"
|
#include "http_negotiate.h"
|
||||||
#include "select.h"
|
#include "select.h"
|
||||||
#include "multi.h"
|
#include "multiif.h"
|
||||||
|
|
||||||
/* And now for the protocols */
|
/* And now for the protocols */
|
||||||
#include "ftp.h"
|
#include "ftp.h"
|
||||||
|
|
Loading…
Reference in New Issue