diff options
| author | lukem <lukem@pkgsrc.org> | 2005-05-14 06:06:26 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2005-05-14 06:06:26 +0000 |
| commit | 0e2d43cf183d3675646c37852b3fe0b19b1b8540 (patch) | |
| tree | 11a9296a1f89675d2d474c546941207b3d3ba308 /net/tnftp | |
| parent | 2cc6e59e11942e7219cfd0bb704c670367a4560a (diff) | |
| download | pkgsrc-0e2d43cf183d3675646c37852b3fe0b19b1b8540.tar.gz | |
Fix the build on OS X.3.
Bump PKGREVISION.
Diffstat (limited to 'net/tnftp')
| -rw-r--r-- | net/tnftp/Makefile | 3 | ||||
| -rw-r--r-- | net/tnftp/files/tnftp.h | 24 |
2 files changed, 15 insertions, 12 deletions
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index 1525cf9b2d8..a19dff9c8b5 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2005/05/14 05:16:09 lukem Exp $ +# $NetBSD: Makefile,v 1.14 2005/05/14 06:06:26 lukem Exp $ # DISTNAME= tnftp-20050514 +PKGREVISION= 1 SVR4_PKGNAME= tnftp CATEGORIES= net MASTER_SITES= # empty diff --git a/net/tnftp/files/tnftp.h b/net/tnftp/files/tnftp.h index 9ff6e90bfb4..3a5089dc52e 100644 --- a/net/tnftp/files/tnftp.h +++ b/net/tnftp/files/tnftp.h @@ -42,22 +42,24 @@ #include <unistd.h> #if HAVE_POLL -# if HAVE_POLL_H -# include <poll.h> -# elif HAVE_SYS_POLL_H -# include <sys/poll.h> -# endif +/* we use poll */ #elif HAVE_SELECT -# ifndef POLLIN -# define POLLIN 1 -# endif -# ifndef POLLOUT -# define POLLOUT 4 -# endif /* we use select */ #else /* ! HAVE_POLL && ! HAVE_SELECT */ # error "no poll() or select() found" #endif + +#if HAVE_POLL_H +# include <poll.h> +#elif HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif +#ifndef POLLIN +# define POLLIN 1 +#endif +#ifndef POLLOUT +# define POLLOUT 4 +#endif #ifndef INFTIM # define INFTIM -1 #endif |