renamed getplatform() to ares__getplatform() to avoid namespace pollution

diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c
index e5088b74619ede2c566793470f23d7e129889e63..4b4c8a7dbde838040dca6d42f54fc827b33895a0 100644 (file)
--- a/ares_gethostbyaddr.c
+++ b/ares_gethostbyaddr.c
@@ -191,7 +191,7 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
 
   PATH_HOSTS[0] = '\0';
 
-  platform = getplatform();
+  platform = ares__getplatform();
 
   if (platform == WIN_NT) {
     char tmp[MAX_PATH];

diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c
index 5339fee887a7e863a52b5dca17c57d623fafef39..72f8f8b91fe3cd82f0c40b169a482e70f4bc6f7e 100644 (file)
--- a/ares_gethostbyname.c
+++ b/ares_gethostbyname.c
@@ -349,7 +349,7 @@ static int file_lookup(const char *name, int family, struct hostent **host)
 
   PATH_HOSTS[0] = '\0';
 
-  platform = getplatform();
+  platform = ares__getplatform();
 
   if (platform == WIN_NT) {
     char tmp[MAX_PATH];

diff --git a/ares_init.c b/ares_init.c
index afcd8d678b3745f5d682c6a0e4c3e08cdbc22289..75064e965295059966266cdfb5a061efef075d69 100644 (file)
--- a/ares_init.c
+++ b/ares_init.c
@@ -717,7 +717,7 @@ DhcpNameServer
       goto okay;
   }
 
-  platform = getplatform();
+  platform = ares__getplatform();
 
   if (platform == WIN_NT)
   {

diff --git a/ares_platform.c b/ares_platform.c
index 0fe2675eae557a1a4260a60af39d17c73b012feb..9aeeb02a91af42fc79db60185ebcebe849dad805 100644 (file)
--- a/ares_platform.c
+++ b/ares_platform.c
@@ -25,7 +25,7 @@
 #define V_PLATFORM_WIN32_NT       2
 #define V_PLATFORM_WIN32_CE       3
 
-win_platform getplatform(void)
+win_platform ares__getplatform(void)
 {
   OSVERSIONINFOEX OsvEx;
 

diff --git a/ares_platform.h b/ares_platform.h
index 1a23ce952bce8a47cf5432725434389707f8c6e7..8d61d252710886689834ad7f8fcca3254f145755 100644 (file)
--- a/ares_platform.h
+++ b/ares_platform.h
@@ -29,7 +29,7 @@ typedef enum {
   WIN_CE
 } win_platform;
 
-extern win_platform getplatform(void);
+win_platform ares__getplatform(void);
 
 #endif