diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /openbsd-compat/getrrsetbyname.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'openbsd-compat/getrrsetbyname.c')
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 4e869c4df..2016ffe31 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c | |||
@@ -144,6 +144,8 @@ _getshort(msgp) | |||
144 | GETSHORT(u, msgp); | 144 | GETSHORT(u, msgp); |
145 | return (u); | 145 | return (u); |
146 | } | 146 | } |
147 | #elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0) | ||
148 | u_int16_t _getshort(register const u_char *); | ||
147 | #endif | 149 | #endif |
148 | 150 | ||
149 | #ifndef HAVE__GETLONG | 151 | #ifndef HAVE__GETLONG |
@@ -156,6 +158,8 @@ _getlong(msgp) | |||
156 | GETLONG(u, msgp); | 158 | GETLONG(u, msgp); |
157 | return (u); | 159 | return (u); |
158 | } | 160 | } |
161 | #elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0) | ||
162 | u_int32_t _getlong(register const u_char *); | ||
159 | #endif | 163 | #endif |
160 | 164 | ||
161 | int | 165 | int |