michael@378: Index: libmemcached-0.48/Makefile.in
michael@378: --- libmemcached-0.48/Makefile.in.orig	2011-03-16 04:40:31.000000000 +0100
michael@378: +++ libmemcached-0.48/Makefile.in	2011-03-18 18:43:52.000000000 +0100
michael@378: @@ -95,10 +95,7 @@
michael@378:  	clients/memerror$(EXEEXT) clients/memflush$(EXEEXT) \
michael@378:  	clients/memrm$(EXEEXT) clients/memstat$(EXEEXT) \
michael@378:  	$(am__EXEEXT_1)
michael@378: -noinst_PROGRAMS = tests/atomsmasher$(EXEEXT) tests/hashplus$(EXEEXT) \
michael@378: -	tests/memplus$(EXEEXT) tests/startservers$(EXEEXT) \
michael@378: -	tests/testapp$(EXEEXT) tests/testhashkit$(EXEEXT) \
michael@378: -	tests/testplus$(EXEEXT) tests/testudp$(EXEEXT) $(am__EXEEXT_3)
michael@378: +noinst_PROGRAMS = 
michael@378:  check_PROGRAMS = $(am__EXEEXT_2)
michael@378:  @BUILD_DOCS_TRUE@am__append_1 = test-docs
michael@378:  DIST_COMMON = README $(am__configure_deps) \
michael@378: @@ -138,7 +135,7 @@
michael@378:  @DTRACE_NEEDS_OBJECTS_TRUE@am__append_13 = libmemcached/libmemcached_probes.o
michael@378:  @DTRACE_NEEDS_OBJECTS_TRUE@am__append_14 = libmemcached/libmemcached_probes.o
michael@378:  @HAVE_SASL_TRUE@am__append_15 = $(LIBSASL)
michael@378: -@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 = clients/memslap
michael@378: +@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 =
michael@378:  @BUILD_BYTEORDER_TRUE@am__append_17 = libmemcached/libbyteorder.la
michael@378:  @INCLUDE_HSIEH_SRC_TRUE@am__append_18 = libhashkit/hsieh.c
michael@378:  @INCLUDE_MURMUR_SRC_TRUE@am__append_19 = libhashkit/murmur.c
michael@378: @@ -409,7 +406,7 @@
michael@378:  libtest_libtest_la_LIBADD =
michael@378:  am_libtest_libtest_la_OBJECTS = libtest/test.lo
michael@378:  libtest_libtest_la_OBJECTS = $(am_libtest_libtest_la_OBJECTS)
michael@378: -@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memslap$(EXEEXT)
michael@378: +@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 =
michael@378:  @HAVE_LIBGTEST_TRUE@am__EXEEXT_2 = unittests/unittests$(EXEEXT)
michael@378:  @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT)
michael@378:  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
michael@378: Index: libmemcached-0.48/configure
michael@378: --- libmemcached-0.48/configure.orig	2011-03-16 04:40:33.000000000 +0100
michael@378: +++ libmemcached-0.48/configure	2011-03-18 18:43:13.000000000 +0100
michael@378: @@ -17719,8 +17719,8 @@
michael@378:  
michael@378:  fi
michael@378:  
michael@378: -      CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
michael@378: -      CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
michael@378: +      CC_WARNINGS="${BASE_WARNINGS} ${CC_WARNINGS_FULL}"
michael@378: +      CXX_WARNINGS="${BASE_WARNINGS} -Wnon-virtual-dtor -Wno-long-long ${CXX_WARNINGS_FULL}"
michael@378:  
michael@378:        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wmissing-declarations from C++" >&5
michael@378:  $as_echo_n "checking whether it is safe to use -Wmissing-declarations from C++... " >&6; }
michael@378: Index: libmemcached-0.48/support/libmemcached.pc.in
michael@378: --- libmemcached-0.48/support/libmemcached.pc.in.orig	2011-02-22 05:06:22.000000000 +0100
michael@378: +++ libmemcached-0.48/support/libmemcached.pc.in	2011-03-18 18:43:13.000000000 +0100
michael@378: @@ -8,3 +8,4 @@
michael@378:  Version: @VERSION@
michael@378:  Libs: @LTLIBSASL@ @LTLIBSASL2@ -L${libdir} -lmemcached
michael@378:  Cflags: -I${includedir}
michael@378: +Requires: libevent sasl
michael@378: Index: memcached-1.4.6/configure
michael@378: --- memcached-1.4.6/configure.orig	2010-04-03 23:26:12.000000000 +0200
michael@378: +++ memcached-1.4.6/configure	2011-03-18 18:43:13.000000000 +0100
michael@378: @@ -7914,7 +7914,6 @@
michael@378:  elif test "$GCC" = "yes"
michael@378:  then
michael@378:    GCC_VERSION=`$CC -dumpversion`
michael@378: -  CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
michael@378:    case $GCC_VERSION in
michael@378:      4.4.*)
michael@378:      CFLAGS="$CFLAGS -fno-strict-aliasing"
michael@378: Index: memcached-1.4.6/thread.c
michael@378: --- memcached-1.4.6/thread.c.orig	2010-04-03 09:07:16.000000000 +0200
michael@378: +++ memcached-1.4.6/thread.c	2011-03-18 18:43:13.000000000 +0100
michael@378: @@ -602,6 +602,7 @@
michael@378:          perror("Can't allocate thread descriptors");
michael@378:          exit(1);
michael@378:      }
michael@378: +    memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
michael@378:  
michael@378:      dispatcher_thread.base = main_base;
michael@378:      dispatcher_thread.thread_id = pthread_self();
michael@379: Index: libmemcache-1.4.0.rc2/src/buffer.c
michael@379: --- libmemcache-1.4.0.rc2/src/buffer.c.orig	2009-11-25 18:36:18.468286813 +0100
michael@379: +++ libmemcache-1.4.0.rc2/src/buffer.c	2009-11-25 18:36:20.700402681 +0100
michael@379: @@ -36,6 +36,7 @@
michael@379:  #include <sys/uio.h>
michael@379:  #include <unistd.h>
michael@379:  #include <sys/errno.h>
michael@379: +#include <errno.h>
michael@379:  
michael@379:  #include "memcache/buffer.h"
michael@379: