diff options
| author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
| commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
| tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /openbsd-compat/getrrsetbyname.c | |
| parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
| parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) | |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'openbsd-compat/getrrsetbyname.c')
| -rw-r--r-- | openbsd-compat/getrrsetbyname.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 07231d005..80af3f542 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c | |||
| @@ -67,13 +67,9 @@ extern int h_errno; | |||
| 67 | #endif | 67 | #endif |
| 68 | #define _THREAD_PRIVATE(a,b,c) (c) | 68 | #define _THREAD_PRIVATE(a,b,c) (c) |
| 69 | 69 | ||
| 70 | /* to avoid conflicts where a platform already has _res */ | 70 | #ifndef HAVE__RES_EXTERN |
| 71 | #ifdef _res | ||
| 72 | # undef _res | ||
| 73 | #endif | ||
| 74 | #define _res _compat_res | ||
| 75 | |||
| 76 | struct __res_state _res; | 71 | struct __res_state _res; |
| 72 | #endif | ||
| 77 | 73 | ||
| 78 | /* Necessary functions and macros */ | 74 | /* Necessary functions and macros */ |
| 79 | 75 | ||