diff options
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index cac799e84..b48fb9342 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -170,15 +170,24 @@ int BSDgetopt(int argc, char * const *argv, const char *opts); | |||
170 | #include "openbsd-compat/getopt.h" | 170 | #include "openbsd-compat/getopt.h" |
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | #if defined(HAVE_DECL_WRITEV) && HAVE_DECL_WRITEV == 0 | 173 | #if ((defined(HAVE_DECL_READV) && HAVE_DECL_READV == 0) || \ |
174 | (defined(HAVE_DECL_WRITEV) && HAVE_DECL_WRITEV == 0)) | ||
174 | # include <sys/types.h> | 175 | # include <sys/types.h> |
175 | # include <sys/uio.h> | 176 | # include <sys/uio.h> |
177 | |||
178 | # if defined(HAVE_DECL_READV) && HAVE_DECL_READV == 0 | ||
179 | int readv(int, struct iovec *, int); | ||
180 | # endif | ||
181 | |||
182 | # if defined(HAVE_DECL_WRITEV) && HAVE_DECL_WRITEV == 0 | ||
176 | int writev(int, struct iovec *, int); | 183 | int writev(int, struct iovec *, int); |
184 | # endif | ||
177 | #endif | 185 | #endif |
178 | 186 | ||
179 | /* Home grown routines */ | 187 | /* Home grown routines */ |
180 | #include "bsd-misc.h" | 188 | #include "bsd-misc.h" |
181 | #include "bsd-setres_id.h" | 189 | #include "bsd-setres_id.h" |
190 | #include "bsd-signal.h" | ||
182 | #include "bsd-statvfs.h" | 191 | #include "bsd-statvfs.h" |
183 | #include "bsd-waitpid.h" | 192 | #include "bsd-waitpid.h" |
184 | #include "bsd-poll.h" | 193 | #include "bsd-poll.h" |
@@ -315,14 +324,13 @@ char *shadow_pw(struct passwd *pw); | |||
315 | #include "fake-rfc2553.h" | 324 | #include "fake-rfc2553.h" |
316 | 325 | ||
317 | /* Routines for a single OS platform */ | 326 | /* Routines for a single OS platform */ |
318 | #include "bsd-cray.h" | ||
319 | #include "bsd-cygwin_util.h" | 327 | #include "bsd-cygwin_util.h" |
320 | 328 | ||
321 | #include "port-aix.h" | 329 | #include "port-aix.h" |
322 | #include "port-irix.h" | 330 | #include "port-irix.h" |
323 | #include "port-linux.h" | 331 | #include "port-linux.h" |
324 | #include "port-solaris.h" | 332 | #include "port-solaris.h" |
325 | #include "port-tun.h" | 333 | #include "port-net.h" |
326 | #include "port-uw.h" | 334 | #include "port-uw.h" |
327 | 335 | ||
328 | /* _FORTIFY_SOURCE breaks FD_ISSET(n)/FD_SET(n) for n > FD_SETSIZE. Avoid. */ | 336 | /* _FORTIFY_SOURCE breaks FD_ISSET(n)/FD_SET(n) for n > FD_SETSIZE. Avoid. */ |