Internal symbols that aren't static are now prefixed with 'Curl_'

2 files changed, 24 insertions, 20 deletions

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 6a9ff6ae8..412511679 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -435,8 +435,10 @@ typedef enum {
 
    NOTE: they return TRUE if the strings match *case insensitively*.
  */
-extern int (strequal)(const char *s1, const char *s2);
-extern int (strnequal)(const char *s1, const char *s2, size_t n);
+extern int (Curl_strequal)(const char *s1, const char *s2);
+extern int (Curl_strnequal)(const char *s1, const char *s2, size_t n);
+#define strequal(a,b) Curl_strequal(a,b)
+#define strnequal(a,b,c) Curl_strnequal(a,b,c)
 
 /* external form function */
 int curl_formparse(char *string,
diff --git a/include/curl/mprintf.h b/include/curl/mprintf.h
index 5590a8df8..7e89fe7d4 100644
--- a/include/curl/mprintf.h
+++ b/include/curl/mprintf.h
@@ -55,26 +55,28 @@
 
 #include <stdarg.h>
 
-int mprintf(const char *format, ...);
-int mfprintf(FILE *fd, const char *format, ...);
-int msprintf(char *buffer, const char *format, ...);
-int msnprintf(char *buffer, size_t maxlength, const char *format, ...);
-int mvprintf(const char *format, va_list args);
-int mvfprintf(FILE *fd, const char *format, va_list args);
-int mvsprintf(char *buffer, const char *format, va_list args);
-int mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
-char *maprintf(const char *format, ...);
-char *mvaprintf(const char *format, va_list args);
+int Curl_mprintf(const char *format, ...);
+int Curl_mfprintf(FILE *fd, const char *format, ...);
+int Curl_msprintf(char *buffer, const char *format, ...);
+int Curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
+int Curl_mvprintf(const char *format, va_list args);
+int Curl_mvfprintf(FILE *fd, const char *format, va_list args);
+int Curl_mvsprintf(char *buffer, const char *format, va_list args);
+int Curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
+char *Curl_maprintf(const char *format, ...);
+char *Curl_mvaprintf(const char *format, va_list args);
 
 #ifdef _MPRINTF_REPLACE
-# define printf mprintf
-# define fprintf mfprintf
-# define sprintf msprintf
-# define snprintf msnprintf
-# define vprintf mvprintf
-# define vfprintf mvfprintf
-# define vsprintf mvsprintf
-# define vsnprintf mvsnprintf
+# define printf Curl_mprintf
+# define fprintf Curl_mfprintf
+# define sprintf Curl_msprintf
+# define snprintf Curl_msnprintf
+# define vprintf Curl_mvprintf
+# define vfprintf Curl_mvfprintf
+# define vsprintf Curl_mvsprintf
+# define vsnprintf Curl_mvsnprintf
+# define aprintf Curl_maprintf
+# define vaprintf Curl_mvaprintf
 #endif
 
 #endif /* H_MPRINTF */