aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-11 08:56:46 +0000
committerYang Tse <yangsita@gmail.com>2009-11-11 08:56:46 +0000
commit5d786d0e9795f6a210645bd75717d3ef1849e5ff (patch)
tree0cd84347575d2f02fab95133ee26a769b3338730
parent5f77eea408cde7975042deb285cf80be1691f34f (diff)
Renamed fpGetNetworkParams and fpSystemFunction036 to avoid namespace pollution with static library
-rw-r--r--ares/ares_init.c8
-rw-r--r--ares/ares_library_init.c10
-rw-r--r--ares/ares_library_init.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/ares/ares_init.c b/ares/ares_init.c
index b2837901d..dc3e52c9a 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -581,7 +581,7 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
if (!fi)
return 0;
- res = (*fpGetNetworkParams) (fi, &size);
+ res = (*ares_fpGetNetworkParams) (fi, &size);
if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS))
goto quit;
@@ -590,7 +590,7 @@ static int get_iphlpapi_dns_info (char *ret_buf, size_t ret_size)
goto quit;
fi = newfi;
- res = (*fpGetNetworkParams) (fi, &size);
+ res = (*ares_fpGetNetworkParams) (fi, &size);
if (res != ERROR_SUCCESS)
goto quit;
@@ -1503,9 +1503,9 @@ static void randomize_key(unsigned char* key,int key_data_len)
int counter=0;
#ifdef WIN32
BOOLEAN res;
- if (fpSystemFunction036)
+ if (ares_fpSystemFunction036)
{
- res = (*fpSystemFunction036) (key, key_data_len);
+ res = (*ares_fpSystemFunction036) (key, key_data_len);
if (res)
randomized = 1;
}
diff --git a/ares/ares_library_init.c b/ares/ares_library_init.c
index 72a6ac9bc..aac34eaf4 100644
--- a/ares/ares_library_init.c
+++ b/ares/ares_library_init.c
@@ -25,8 +25,8 @@
/* library-private global and unique instance vars */
#ifdef USE_WINSOCK
-fpGetNetworkParams_t fpGetNetworkParams = ZERO_NULL;
-fpSystemFunction036_t fpSystemFunction036 = ZERO_NULL;
+fpGetNetworkParams_t ares_fpGetNetworkParams = ZERO_NULL;
+fpSystemFunction036_t ares_fpSystemFunction036 = ZERO_NULL;
#endif
/* library-private global vars with source visibility restricted to this file */
@@ -49,9 +49,9 @@ static int ares_win32_init(void)
if (!hnd_iphlpapi)
return ARES_ELOADIPHLPAPI;
- fpGetNetworkParams = (fpGetNetworkParams_t)
+ ares_fpGetNetworkParams = (fpGetNetworkParams_t)
GetProcAddress(hnd_iphlpapi, "GetNetworkParams");
- if (!fpGetNetworkParams)
+ if (!ares_fpGetNetworkParams)
{
FreeLibrary(hnd_iphlpapi);
return ARES_EADDRGETNETWORKPARAMS;
@@ -67,7 +67,7 @@ static int ares_win32_init(void)
hnd_advapi32 = LoadLibrary("advapi32.dll");
if (hnd_advapi32)
{
- fpSystemFunction036 = (fpSystemFunction036_t)
+ ares_fpSystemFunction036 = (fpSystemFunction036_t)
GetProcAddress(hnd_advapi32, "SystemFunction036");
}
diff --git a/ares/ares_library_init.h b/ares/ares_library_init.h
index dc8f11693..515c17d82 100644
--- a/ares/ares_library_init.h
+++ b/ares/ares_library_init.h
@@ -31,8 +31,8 @@ typedef BOOLEAN (APIENTRY *fpSystemFunction036_t) (void*, ULONG);
/* Forward-declaration of variables defined in ares_library_init.c */
/* that are global and unique instances for whole c-ares library. */
-extern fpGetNetworkParams_t fpGetNetworkParams;
-extern fpSystemFunction036_t fpSystemFunction036;
+extern fpGetNetworkParams_t ares_fpGetNetworkParams;
+extern fpSystemFunction036_t ares_fpSystemFunction036;
#endif /* USE_WINSOCK */