Commit 8860e97b authored by Martti Mela's avatar Martti Mela
Browse files

removed OSX specific parts from su_wait.h

darcs-hash:20060928154323-1b897-31f364ee70cd4913d4ad764fc9c730daf3ae73ba.gz
parent 5fef10e4
...@@ -47,41 +47,13 @@ ...@@ -47,41 +47,13 @@
#if SU_HAVE_POLL #if SU_HAVE_POLL
#include <sys/poll.h> #include <sys/poll.h>
#endif #endif
#if SU_HAVE_OSX_CF_API
#include <CoreFoundation/CoreFoundation.h>
#endif
SOFIA_BEGIN_DECLS SOFIA_BEGIN_DECLS
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* Constants */ /* Constants */
#if SU_HAVE_OSX_CF_API #if SU_HAVE_POLL || DOCUMENTATION_ONLY
#define SU_WAIT_CMP(x, y) \
(((x).fd - (y).fd) ? ((x).fd - (y).fd) : ((x).events - (y).events))
/** Incoming data is available on socket. @HI */
#define SU_WAIT_IN (POLLIN)
/** Data can be sent on socket. @HI */
#define SU_WAIT_OUT (POLLOUT)
/** Socket is connected. @HI */
#define SU_WAIT_CONNECT (POLLOUT)
/** An error occurred on socket. @HI */
#define SU_WAIT_ERR (POLLERR)
/** The socket connection was closed. @HI */
#define SU_WAIT_HUP (POLLHUP)
/** A listening socket accepted a new connection. @HI */
#define SU_WAIT_ACCEPT (POLLIN)
/** No timeout for su_wait(). */
#define SU_WAIT_FOREVER (-1)
/** The return value of su_wait() if timeout occurred. */
#define SU_WAIT_TIMEOUT (-2)
/** Initializer for a wait object. @HI */
#define SU_WAIT_INIT { INVALID_SOCKET, 0, 0, NULL }
#elif SU_HAVE_POLL || DOCUMENTATION_ONLY
/** Compare wait object */ /** Compare wait object */
#define SU_WAIT_CMP(x, y) \ #define SU_WAIT_CMP(x, y) \
(((x).fd - (y).fd) ? ((x).fd - (y).fd) : ((x).events - (y).events)) (((x).fd - (y).fd) ? ((x).fd - (y).fd) : ((x).events - (y).events))
...@@ -146,17 +118,6 @@ typedef struct _pollfd { ...@@ -146,17 +118,6 @@ typedef struct _pollfd {
short events; /* requested events */ short events; /* requested events */
short revents; /* returned events */ short revents; /* returned events */
} su_wait_t; } su_wait_t;
#elif SU_HAVE_OSX_CF_API
/* Use container for both pollfds and CoreFoundation sources */
/* NOTE! The order is crucial! */
typedef struct {
/* struct pollfd w_fd[1]; */
int fd;
short events;
short revents;
CFRunLoopSourceRef w_source;
} su_wait_t;
#elif SU_HAVE_BSDSOCK #elif SU_HAVE_BSDSOCK
typedef struct pollfd su_wait_t; typedef struct pollfd su_wait_t;
#elif SU_HAVE_WINSOCK #elif SU_HAVE_WINSOCK
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment