GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source 
Conflicts:
	configure.in
This commit is contained in:
Nick Mathewson 2012-03-13 15:56:35 -04:00
commit 45d6213ef5
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -761,11 +761,6 @@ if test x$enable_gcc_warnings != xno && test "$GCC" = "yes"; then
#error #error
#endif])], have_clang=yes, have_clang=no) #endif])], have_clang=yes, have_clang=no)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9)
#error
#endif])], have_clang29orlower=yes, have_clang29orlower=no)
CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum" CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum"
if test x$enable_gcc_warnings = xyes; then if test x$enable_gcc_warnings = xyes; then
CFLAGS="$CFLAGS -Werror" CFLAGS="$CFLAGS -Werror"
@ -784,10 +779,8 @@ if test x$enable_gcc_warnings != xno && test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -Waddress" CFLAGS="$CFLAGS -Waddress"
fi fi
if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then if test x$have_gcc42 = xyes && test x$have_clang = xno; then
# These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2
# We only disable these for clang 2.9 and lower, in case they are
# supported in later versions.
CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init"
fi fi

2
kqueue.c
View File

@ -171,7 +171,7 @@ err:
static void static void
kq_setup_kevent(struct kevent *out, evutil_socket_t fd, int filter, short change) kq_setup_kevent(struct kevent *out, evutil_socket_t fd, int filter, short change)
{ {
memset(out, 0, sizeof(out)); memset(out, 0, sizeof(struct kevent));
out->ident = fd; out->ident = fd;
out->filter = filter; out->filter = filter;