diff options
Diffstat (limited to 'lib/libevent/evutil.h')
| -rw-r--r-- | lib/libevent/evutil.h | 114 |
1 files changed, 7 insertions, 107 deletions
diff --git a/lib/libevent/evutil.h b/lib/libevent/evutil.h index c0e1a5d292d..1a7b6864d04 100644 --- a/lib/libevent/evutil.h +++ b/lib/libevent/evutil.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evutil.h,v 1.1 2010/04/21 20:02:40 nicm Exp $ */ +/* $OpenBSD: evutil.h,v 1.2 2010/04/21 21:02:47 nicm Exp $ */ /* * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> @@ -26,6 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef _EVUTIL_H_ #define _EVUTIL_H_ @@ -40,139 +41,38 @@ extern "C" { #endif -#include <event-config.h> -#ifdef _EVENT_HAVE_SYS_TIME_H +#include <sys/types.h> #include <sys/time.h> -#endif -#ifdef _EVENT_HAVE_STDINT_H -#include <stdint.h> -#elif defined(_EVENT_HAVE_INTTYPES_H) + #include <inttypes.h> -#endif -#ifdef _EVENT_HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif #include <stdarg.h> +#include <stdint.h> -#ifdef _EVENT_HAVE_UINT64_T #define ev_uint64_t uint64_t #define ev_int64_t int64_t -#elif defined(WIN32) -#define ev_uint64_t unsigned __int64 -#define ev_int64_t signed __int64 -#elif _EVENT_SIZEOF_LONG_LONG == 8 -#define ev_uint64_t unsigned long long -#define ev_int64_t long long -#elif _EVENT_SIZEOF_LONG == 8 -#define ev_uint64_t unsigned long -#define ev_int64_t long -#else -#error "No way to define ev_uint64_t" -#endif - -#ifdef _EVENT_HAVE_UINT32_T #define ev_uint32_t uint32_t -#elif defined(WIN32) -#define ev_uint32_t unsigned int -#elif _EVENT_SIZEOF_LONG == 4 -#define ev_uint32_t unsigned long -#elif _EVENT_SIZEOF_INT == 4 -#define ev_uint32_t unsigned int -#else -#error "No way to define ev_uint32_t" -#endif - -#ifdef _EVENT_HAVE_UINT16_T #define ev_uint16_t uint16_t -#elif defined(WIN32) -#define ev_uint16_t unsigned short -#elif _EVENT_SIZEOF_INT == 2 -#define ev_uint16_t unsigned int -#elif _EVENT_SIZEOF_SHORT == 2 -#define ev_uint16_t unsigned short -#else -#error "No way to define ev_uint16_t" -#endif - -#ifdef _EVENT_HAVE_UINT8_T #define ev_uint8_t uint8_t -#else -#define ev_uint8_t unsigned char -#endif int evutil_socketpair(int d, int type, int protocol, int sv[2]); int evutil_make_socket_nonblocking(int sock); -#ifdef WIN32 -#define EVUTIL_CLOSESOCKET(s) closesocket(s) -#else -#define EVUTIL_CLOSESOCKET(s) close(s) -#endif -#ifdef WIN32 -#define EVUTIL_SOCKET_ERROR() WSAGetLastError() -#define EVUTIL_SET_SOCKET_ERROR(errcode) \ - do { WSASetLastError(errcode); } while (0) -#else +#define EVUTIL_CLOSESOCKET(s) close(s) #define EVUTIL_SOCKET_ERROR() (errno) -#define EVUTIL_SET_SOCKET_ERROR(errcode) \ - do { errno = (errcode); } while (0) -#endif /* * Manipulation functions for struct timeval */ -#ifdef _EVENT_HAVE_TIMERADD #define evutil_timeradd(tvp, uvp, vvp) timeradd((tvp), (uvp), (vvp)) #define evutil_timersub(tvp, uvp, vvp) timersub((tvp), (uvp), (vvp)) -#else -#define evutil_timeradd(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) -#define evutil_timersub(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ - } while (0) -#endif /* !_EVENT_HAVE_HAVE_TIMERADD */ - -#ifdef _EVENT_HAVE_TIMERCLEAR #define evutil_timerclear(tvp) timerclear(tvp) -#else -#define evutil_timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 -#endif - -#define evutil_timercmp(tvp, uvp, cmp) \ - (((tvp)->tv_sec == (uvp)->tv_sec) ? \ - ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ - ((tvp)->tv_sec cmp (uvp)->tv_sec)) - -#ifdef _EVENT_HAVE_TIMERISSET +#define evutil_timercmp(tvp, uvp, cmp) timercmp((tvp), (uvp), cmp) #define evutil_timerisset(tvp) timerisset(tvp) -#else -#define evutil_timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) -#endif - /* big-int related functions */ ev_int64_t evutil_strtoll(const char *s, char **endptr, int base); - -#ifdef _EVENT_HAVE_GETTIMEOFDAY #define evutil_gettimeofday(tv, tz) gettimeofday((tv), (tz)) -#else -struct timezone; -int evutil_gettimeofday(struct timeval *tv, struct timezone *tz); -#endif int evutil_snprintf(char *buf, size_t buflen, const char *format, ...) #ifdef __GNUC__ |