diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-11-11 08:56:46 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-11-11 08:56:46 +0000 |
| commit | ea29eeb4eb64e96848621a3d5fb7fb445c393aa6 (patch) | |
| tree | 64b42a2b9f7034d27fae66c5de994a618f51adfa /ares_library_init.c | |
| parent | c91a177d712b1d632a8b0774a5009e5d65022b0b (diff) | |
| download | c-ares-ea29eeb4eb64e96848621a3d5fb7fb445c393aa6.tar.gz c-ares-ea29eeb4eb64e96848621a3d5fb7fb445c393aa6.tar.bz2 c-ares-ea29eeb4eb64e96848621a3d5fb7fb445c393aa6.zip | |
Renamed fpGetNetworkParams and fpSystemFunction036 to avoid namespace pollution with static library
Diffstat (limited to 'ares_library_init.c')
| -rw-r--r-- | ares_library_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ares_library_init.c b/ares_library_init.c index 72a6ac9..aac34ea 100644 --- a/ares_library_init.c +++ b/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"); } |