diff options
| author | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
| commit | e5099a2c85468d01d084b1071f724bc20766271d (patch) | |
| tree | 50e180dfcaa058cefb382d2ab931592cddbd007d /extra/libevent | |
| parent | f83113df07d6ef8e8a6d1db8f6dc3bb90fb0652a (diff) | |
| parent | e9bce6c9d4bde35306b845e22e9b5ada69c4512f (diff) | |
| download | mariadb-git-e5099a2c85468d01d084b1071f724bc20766271d.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'extra/libevent')
| -rw-r--r-- | extra/libevent/devpoll.c | 2 | ||||
| -rw-r--r-- | extra/libevent/evbuffer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extra/libevent/devpoll.c b/extra/libevent/devpoll.c index 20813380b20..82427c9e229 100644 --- a/extra/libevent/devpoll.c +++ b/extra/libevent/devpoll.c @@ -140,7 +140,7 @@ devpoll_init(struct event_base *base) return (NULL); if (getrlimit(RLIMIT_NOFILE, &rl) == 0 && - rl.rlim_cur != RLIM_INFINITY) + (unsigned long long) rl.rlim_cur != (unsigned long long) RLIM_INFINITY) nfiles = rl.rlim_cur - 1; /* Initialize the kernel queue */ diff --git a/extra/libevent/evbuffer.c b/extra/libevent/evbuffer.c index 33315120c3e..758143c8225 100644 --- a/extra/libevent/evbuffer.c +++ b/extra/libevent/evbuffer.c @@ -25,12 +25,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> - #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <sys/types.h> + #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif |