diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-02-25 19:47:48 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-02-25 19:47:48 +1100 |
| commit | 0132056efabc5edb85c3c7105d2fb6dee41843c6 (patch) | |
| tree | cf453fc1e64e87160f5e7a274272da5a37e78a01 | |
| parent | 8e206e0dd6b9f757b07979e48f53ad5bf9b7b52b (diff) | |
Improve handling of _getshort and _getlong.
If the system native ones are exactly as required then use them,
otherwise use the local versions mapped to another name to prevent
name collisions.
| -rw-r--r-- | openbsd-compat/getrrsetbyname.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index caadceb6..cc1f8ae5 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c @@ -110,10 +110,17 @@ struct __res_state _res; #endif /* + * If the system doesn't have _getshort/_getlong or that are not exactly what + * we need then use local replacements, avoiding name collisions. + */ +#if !defined(HAVE__GETSHORT) || !defined(HAVE__GETLONG) || \ + !defined(HAVE_DECL__GETSHORT) || HAVE_DECL__GETSHORT == 0 || \ + !defined(HAVE_DECL__GETLONG) || HAVE_DECL__GETLONG == 0 +#define _getshort(x) (_ssh_compat_getshort(x)) +#define _getlong(x) (_ssh_compat_getlong(x)) +/* * Routines to insert/extract short/long's. */ - -#ifndef HAVE__GETSHORT static u_int16_t _getshort(const u_char *msgp) { @@ -122,11 +129,7 @@ _getshort(const u_char *msgp) GETSHORT(u, msgp); return (u); } -#elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0) -u_int16_t _getshort(const u_char *); -#endif -#ifndef HAVE__GETLONG static u_int32_t _getlong(const u_char *msgp) { @@ -135,8 +138,6 @@ _getlong(const u_char *msgp) GETLONG(u, msgp); return (u); } -#elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0) -u_int32_t _getlong(const u_char *); #endif /* ************** */ |