Commit e3fa7d02 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent a1813e2b

lib/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -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	\

  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	\

  setup.h transfer.h select.h
 
  setup.h transfer.h select.h easyif.h multiif.h

lib/easy.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
#include "share.h"

#include "memory.h"

#include "progress.h"

#include "easy.h"

#include "easyif.h"



#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>

lib/easy.h→lib/easyif.h

+3 −7
Original line number Diff line number Diff line 
#ifndef __EASY_H

#define __EASY_H

#ifndef __EASYIF_H

#define __EASYIF_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -23,13 +23,9 @@ 
 * $Id$

 ***************************************************************************/



/* This file shadows for <curl/easy.h> in some compilers

 */

#include <curl/easy.h>



/*

 * Prototypes for library-wide functions provided by easy.c

 */

void Curl_easy_addmulti(struct SessionHandle *data, void *multi);



#endif /* __EASY_H */
 
#endif /* __EASYIF_H */

lib/multi.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
#include "connect.h"

#include "progress.h"

#include "memory.h"

#include "easy.h"

#include "multi.h"

#include "easyif.h"

#include "multiif.h"



/* The last #include file should be: */

#include "memdebug.h"

lib/multi.h→lib/multiif.h

+3 −7
Original line number Diff line number Diff line 
#ifndef __MULTI_H

#define __MULTI_H

#ifndef __MULTIIF_H

#define __MULTIIF_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -23,13 +23,9 @@ 
 * $Id$

 ***************************************************************************/



 /* This file shadows for <curl/multi.h> in some compilers

 */

#include <curl/multi.h>



/*

 * Prototypes for library-wide functions provided by multi.c

 */

void Curl_multi_rmeasy(void *multi, CURL *data);



#endif /* __MULTI_H */
 
#endif /* __MULTIIF_H */