diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-08-12 00:04:30 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-08-12 00:04:30 +0200 |
| commit | 86418bfbbe2d6afcd630f93d5858f2d3353e12f9 (patch) | |
| tree | f7e06b71df755e454cf8b5a8a20795288733867c /include/libssh/priv.h | |
| parent | 1e1c13f756287e14ff37b6410ef29c67494c830b (diff) | |
| parent | db284d60b97bbee864d88737b4f8c6ae5b03c8ff (diff) | |
| download | libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.gz libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.xz libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.zip | |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'include/libssh/priv.h')
| -rw-r--r-- | include/libssh/priv.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index af3dc0b6..152753a3 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -152,13 +152,25 @@ typedef struct pollfd_s { } pollfd_t; /* poll.c */ -#define POLLIN 0x001 /* There is data to read. */ +#ifndef POLLIN +# define POLLIN 0x001 /* There is data to read. */ +#endif +#ifndef POLLPRI #define POLLPRI 0x002 /* There is urgent data to read. */ +#endif +#ifndef POLLOUT #define POLLOUT 0x004 /* Writing now will not block. */ +#endif +#ifndef POLLERR #define POLLERR 0x008 /* Error condition. */ +#endif +#ifndef POLLHUP #define POLLHUP 0x010 /* Hung up. */ +#endif +#ifndef POLLNVAL #define POLLNVAL 0x020 /* Invalid polling request. */ +#endif typedef unsigned long int nfds_t; #endif /* HAVE_POLL */ |