diff options
| author | Andreas Schneider <mail@cynapses.org> | 2009-08-25 13:54:46 +0200 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2009-08-25 13:54:46 +0200 |
| commit | 7c575a241868b546a09de5cd8953bb686aed69e8 (patch) | |
| tree | a9ce8414bc6d306cde39311eadde77293e7c70c1 /include | |
| parent | 47cac13c0a7abbee0a40db244be3f19dc31f4c4f (diff) | |
| download | libssh-7c575a241868b546a09de5cd8953bb686aed69e8.tar.gz libssh-7c575a241868b546a09de5cd8953bb686aed69e8.tar.xz libssh-7c575a241868b546a09de5cd8953bb686aed69e8.zip | |
Fix typedef collisons on Solaris.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libssh/priv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 83a004c..84b424d 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -140,13 +140,13 @@ typedef BN_CTX* bignum_CTX; /* poll support */ #ifdef HAVE_POLL #include <poll.h> -typedef struct pollfd pollfd_t; +typedef struct pollfd ssh_pollfd_t; #else /* HAVE_POLL */ -typedef struct pollfd_s { +typedef struct ssh_pollfd_struct { socket_t fd; /* file descriptor */ short events; /* requested events */ short revents; /* returned events */ -} pollfd_t; +} ssh_pollfd_t; /* poll.c */ #ifndef POLLIN @@ -558,7 +558,7 @@ ssh_string agent_sign_data(struct ssh_session_struct *session, #endif /* poll.c */ -int ssh_poll(pollfd_t *fds, nfds_t nfds, int timeout); +int ssh_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout); typedef struct ssh_poll_ctx SSH_POLL_CTX; typedef struct ssh_poll SSH_POLL; |