Commit 9ebe4ab6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Dominick Meglio's fix to make our private gettimeofday() use the ares_ 

namespace
parent a0edfb90

ares/nameser.h

+12 −11
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ struct iovec 
#define getpid() _getpid()

#define getpid() _getpid()





int strcasecmp(const char *a, const char *b);

int strcasecmp(const char *a, const char *b);

int gettimeofday(struct timeval *tv, struct timezone *tz);

int ares_gettimeofday(struct timeval *tv, struct timezone *tz);

#define gettimeofday(tv,tz) ares_gettimeofday(tv,tz)





#define NS_CMPRSFLGS  0xc0  

#define NS_CMPRSFLGS  0xc0

ares/windows_port.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ strcasecmp(const char *a, const char *b) 
}

}





int 

int 

gettimeofday(struct timeval *tv, struct timezone *tz) 

ares_gettimeofday(struct timeval *tv, struct timezone *tz) 

{

{

    FILETIME        ft;

    FILETIME        ft;

    LARGE_INTEGER   li;

    LARGE_INTEGER   li;