diff options
| author | lukem <lukem@pkgsrc.org> | 2005-05-11 09:58:55 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2005-05-11 09:58:55 +0000 |
| commit | 8be484732b022cd71d2fa312ffef243522e2fbd4 (patch) | |
| tree | c47608e04af6eeda9c5a95dc6f536acc3db74e58 /net/tnftp/files/tnftp.h | |
| parent | 0deed5910da28b76a8aceede887d9e803435aaf9 (diff) | |
| download | pkgsrc-8be484732b022cd71d2fa312ffef243522e2fbd4.tar.gz | |
Merge tnftp 20050511.
(Future merges should be easier as this time I froze the vendor RCSIDs)
Diffstat (limited to 'net/tnftp/files/tnftp.h')
| -rw-r--r-- | net/tnftp/files/tnftp.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/net/tnftp/files/tnftp.h b/net/tnftp/files/tnftp.h index 6c5100644a8..e1462c4faba 100644 --- a/net/tnftp/files/tnftp.h +++ b/net/tnftp/files/tnftp.h @@ -1,7 +1,7 @@ -/* $Id: tnftp.h,v 1.4 2005/01/04 23:44:24 lukem Exp $ */ +/* NetBSD: tnftp.h,v 1.12 2005/05/11 04:21:53 lukem Exp */ #define FTP_PRODUCT "tnftp" -#define FTP_VERSION "20050103" +#define FTP_VERSION "20050511" #include "config.h" @@ -48,10 +48,26 @@ # include <sys/poll.h> # endif #elif HAVE_SELECT -# define USE_SELECT -#else +# 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 +#ifndef INFTIM +# define INFTIM -1 +#endif +#if ! HAVE_STRUCT_POLLFD +struct pollfd { + int fd; + short events; + short revents; +}; +#endif #if HAVE_DIRENT_H # include <dirent.h> |