shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-06 10:27:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix typedef collisons on Solaris.

Browse Source
This commit is contained in:
Andreas Schneider
2009-08-25 13:54:46 +02:00
parent 47cac13c0a
commit 7c575a2418
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libssh/priv.h
View File

@@ -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;