diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
| commit | f9e888643115b4b2f28853ebd1733f4410fb8839 (patch) | |
| tree | 58c69f6cef623679080e8933b6c79880bfbd7cb8 /resolv | |
| parent | d78eef6ebc008f784f501ce208bef12c6eafda27 (diff) | |
| parent | b934acf0e93c5a220551ed6e686bb9d45a24a8cc (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Versions | 2 | ||||
| -rw-r--r-- | resolv/res_send.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resolv/Versions b/resolv/Versions index 93faf1e2f5..6f02597372 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -97,6 +97,6 @@ libnss_dns { libanl { GLIBC_2.2.3 { - getaddrinfo_a; gai_cancel; gai_error; gai_suspend; + gai_cancel; gai_error; gai_suspend; getaddrinfo_a; } } diff --git a/resolv/res_send.c b/resolv/res_send.c index c790031b45..60da5c901b 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -155,7 +155,7 @@ evSubTime(struct timespec *res, const struct timespec *minuend, } } -static inline int +static int evCmpTime(struct timespec a, struct timespec b) { long x = a.tv_sec - b.tv_sec; @@ -164,7 +164,7 @@ evCmpTime(struct timespec a, struct timespec b) { return (x < 0L ? (-1) : x > 0L ? (1) : (0)); } -static inline void +static void evNowTime(struct timespec *res) { struct timeval now; |