Permalink
Browse files

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

Conflicts:
	configure.in
  • Loading branch information...
2 parents 2d2aba1 + c41c1a2 commit 45d6213ef57c946857c48efa70ce33997d890464 Nick Mathewson committed Mar 13, 2012
Showing with 2 additions and 9 deletions.
  1. +1 −8 configure.in
  2. +1 −1 kqueue.c
View
@@ -761,11 +761,6 @@ if test x$enable_gcc_warnings != xno && test "$GCC" = "yes"; then
#error
#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"
if test x$enable_gcc_warnings = xyes; then
CFLAGS="$CFLAGS -Werror"
@@ -784,10 +779,8 @@ if test x$enable_gcc_warnings != xno && test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -Waddress"
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
- # We only disable these for clang 2.9 and lower, in case they are
- # supported in later versions.
CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init"
fi
View
@@ -171,7 +171,7 @@ kq_init(struct event_base *base)
static void
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->filter = filter;

0 comments on commit 45d6213

Please sign in to comment.