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.

7 files changed, 11 insertions, 20 deletions

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 59de0593b..4d5778fb1 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -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
diff --git a/lib/easy.c b/lib/easy.c
index 9310b843a..986f5af7e 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -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>
diff --git a/lib/easy.h b/lib/easyif.h
index 1a9e0d8d6..f901ab595 100644
--- a/lib/easy.h
+++ b/lib/easyif.h
@@ -1,5 +1,5 @@
-#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 */
diff --git a/lib/multi.c b/lib/multi.c
index 6d037f098..a2b230ff5 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -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"
diff --git a/lib/multi.h b/lib/multiif.h
index ef84d6a1c..5c3a9c53f 100644
--- a/lib/multi.h
+++ b/lib/multiif.h
@@ -1,5 +1,5 @@
-#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 */
diff --git a/lib/strerror.c b/lib/strerror.c
index f07e1df47..ae618c6e4 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -31,7 +31,6 @@
 #include <idna.h>
 #endif
 
-#include "multi.h"
 #include "strerror.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
diff --git a/lib/url.c b/lib/url.c
index 6c3b662b4..67e634077 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -118,7 +118,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
 #include "http_digest.h"
 #include "http_negotiate.h"
 #include "select.h"
-#include "multi.h"
+#include "multiif.h"
 
 /* And now for the protocols */
 #include "ftp.h"