diff options
| author | grant <grant@pkgsrc.org> | 2004-05-12 21:50:43 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-05-12 21:50:43 +0000 |
| commit | 57355eed05d918c4bbba0f245010800217317641 (patch) | |
| tree | cb3aa3c0d4f854f9f646a3487882655eeb2c43f4 | |
| parent | 5adcc6fc9ecc63417e8e9c41c83eb3e88fe47242 (diff) | |
| download | pkgsrc-57355eed05d918c4bbba0f245010800217317641.tar.gz | |
don't include poll.h or sys/poll.h, but instead, undefine HAVE_POLL_H
and HAVE_SYS_POLL_H if we don't have a native poll() implementation.
prevents including of libnbcompat's poll.h as well as the system's
poll.h where we should be ignoring the system's poll.h.
fix tested by Jeff Rizzo on MacOSX 10.3.3.
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgtools/libnbcompat/files/nbcompat.h b/pkgtools/libnbcompat/files/nbcompat.h index 213c1368174..b939078e21a 100644 --- a/pkgtools/libnbcompat/files/nbcompat.h +++ b/pkgtools/libnbcompat/files/nbcompat.h @@ -1,4 +1,4 @@ -/* $NetBSD: nbcompat.h,v 1.33 2004/04/20 12:13:05 grant Exp $ */ +/* $NetBSD: nbcompat.h,v 1.34 2004/05/12 21:50:43 grant Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -66,13 +66,9 @@ #include <termios.h> #include <unistd.h> -#if HAVE_POLL -# if HAVE_POLL_H -# include <poll.h> -# elif HAVE_SYS_POLL_H -# include <sys/poll.h> -# endif -#else +#if !HAVE_POLL +# undef HAVE_POLL_H +# undef HAVE_SYS_POLL_H # include <nbcompat/poll.h> #endif |