diff options
author | Yang Tse <yangsita@gmail.com> | 2011-03-25 17:57:02 +0100 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2011-03-25 17:57:02 +0100 |
commit | 5e5c0132e6469a7eaa580ebc156fd87e650ee4cb (patch) | |
tree | fb894041cbb2b569083d420c0fc1514f8c3b03f1 | |
parent | e49ce8f97330789dc74d7e32d5d7b8828a7d557f (diff) | |
download | c-ares-5e5c0132e6469a7eaa580ebc156fd87e650ee4cb.tar.gz c-ares-5e5c0132e6469a7eaa580ebc156fd87e650ee4cb.tar.bz2 c-ares-5e5c0132e6469a7eaa580ebc156fd87e650ee4cb.zip |
renamed getplatform() to ares__getplatform() to avoid namespace pollution
-rw-r--r-- | ares_gethostbyaddr.c | 2 | ||||
-rw-r--r-- | ares_gethostbyname.c | 2 | ||||
-rw-r--r-- | ares_init.c | 2 | ||||
-rw-r--r-- | ares_platform.c | 2 | ||||
-rw-r--r-- | ares_platform.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c index e5088b7..4b4c8a7 100644 --- 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 5339fee..72f8f8b 100644 --- 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 afcd8d6..75064e9 100644 --- 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 0fe2675..9aeeb02 100644 --- 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 1a23ce9..8d61d25 100644 --- 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 |