From 801b9edfa3d987f51ca3ee3d16f147ed0f56329c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Apr 2012 20:12:16 +0000 Subject: cosmetics, he says --- Changes | 4 ++-- ev.c | 30 +++++++++++++++--------------- event.c | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Changes b/Changes index b32b1b4..f07ecdd 100644 --- a/Changes +++ b/Changes @@ -6,10 +6,10 @@ TODO: EV_STANDALONE == NO_HASSEL (do not use clock_gettime in ev_standalone) TODO: document WSA_EV_USE_SOCKET in win32 part TODO: ^ OR use WSASend/WSARecv on the handle, which always works TODO: use __OPTIMIZE__ or __OPTIMIZE_SIZE__? - - ev_once: undef EV_ERROR in ev_kqueue.c, to avoid clashing with - libev's EV_ERROR (reported by 191919). TODO: Jeff Davey libev patch + - ev_once: undef EV_ERROR in ev_kqueue.c, to avoid clashing with + libev's EV_ERROR (reported by 191919). - (ecb) add memory fence support for xlC (Darin McBride). - (ecb) add memory fence support for gcc-mips (Anton Kirilov). - work around some kernels losing file descriptors by leaking diff --git a/ev.c b/ev.c index 195cc61..8444fc3 100644 --- a/ev.c +++ b/ev.c @@ -61,7 +61,7 @@ # define EV_USE_MONOTONIC 1 # endif # endif -# elif !defined(EV_USE_CLOCK_SYSCALL) +# elif !defined EV_USE_CLOCK_SYSCALL # define EV_USE_CLOCK_SYSCALL 0 # endif @@ -221,25 +221,25 @@ /* this block tries to deduce configuration from header-defined symbols and defaults */ /* try to deduce the maximum number of signals on this platform */ -#if defined (EV_NSIG) +#if defined EV_NSIG /* use what's provided */ -#elif defined (NSIG) +#elif defined NSIG # define EV_NSIG (NSIG) -#elif defined(_NSIG) +#elif defined _NSIG # define EV_NSIG (_NSIG) -#elif defined (SIGMAX) +#elif defined SIGMAX # define EV_NSIG (SIGMAX+1) -#elif defined (SIG_MAX) +#elif defined SIG_MAX # define EV_NSIG (SIG_MAX+1) -#elif defined (_SIG_MAX) +#elif defined _SIG_MAX # define EV_NSIG (_SIG_MAX+1) -#elif defined (MAXSIG) +#elif defined MAXSIG # define EV_NSIG (MAXSIG+1) -#elif defined (MAX_SIG) +#elif defined MAX_SIG # define EV_NSIG (MAX_SIG+1) -#elif defined (SIGARRAYSIZE) +#elif defined SIGARRAYSIZE # define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ -#elif defined (_sys_nsig) +#elif defined _sys_nsig # define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ #else # error "unable to find value for NSIG, please report" @@ -261,7 +261,7 @@ #endif #ifndef EV_USE_MONOTONIC -# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 +# if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 # define EV_USE_MONOTONIC EV_FEATURE_OS # else # define EV_USE_MONOTONIC 0 @@ -397,7 +397,7 @@ #if !EV_USE_NANOSLEEP /* hp-ux has it in sys/time.h, which we unconditionally include above */ -# if !defined(_WIN32) && !defined(__hpux) +# if !defined _WIN32 && !defined __hpux # include # endif #endif @@ -1334,7 +1334,7 @@ ev_sleep (ev_tstamp delay) EV_TS_SET (ts, delay); nanosleep (&ts, 0); -#elif defined(_WIN32) +#elif defined _WIN32 Sleep ((unsigned long)(delay * 1e3)); #else struct timeval tv; @@ -3743,7 +3743,7 @@ ev_check_2625 (EV_P) inline_size int infy_newfd (void) { -#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK) +#if defined IN_CLOEXEC && defined IN_NONBLOCK int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK); if (fd >= 0) return fd; diff --git a/event.c b/event.c index aaf6d53..97b4cbe 100644 --- a/event.c +++ b/event.c @@ -1,7 +1,7 @@ /* * libevent compatibility layer * - * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann + * Copyright (c) 2007,2008,2009,2010,2012 Marc Alexander Lehmann * All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- -- cgit v1.2.3