You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.9 KiB
66 lines
2.9 KiB
Index: libmemcached-0.43/Makefile.in |
|
--- libmemcached-0.43/Makefile.in.orig 2010-07-29 00:34:16.000000000 +0200 |
|
+++ libmemcached-0.43/Makefile.in 2010-09-29 19:42:31.000000000 +0200 |
|
@@ -79,10 +79,7 @@ |
|
clients/memerror$(EXEEXT) clients/memflush$(EXEEXT) \ |
|
clients/memrm$(EXEEXT) clients/memstat$(EXEEXT) \ |
|
$(am__EXEEXT_1) |
|
-noinst_PROGRAMS = tests/atomsmasher$(EXEEXT) tests/hashplus$(EXEEXT) \ |
|
- tests/memplus$(EXEEXT) tests/startservers$(EXEEXT) \ |
|
- tests/testapp$(EXEEXT) tests/testhashkit$(EXEEXT) \ |
|
- tests/testplus$(EXEEXT) tests/testudp$(EXEEXT) $(am__EXEEXT_3) |
|
+noinst_PROGRAMS = |
|
check_PROGRAMS = $(am__EXEEXT_2) |
|
@BUILD_DOCS_TRUE@am__append_1 = test-docs |
|
DIST_COMMON = README $(am__configure_deps) \ |
|
@@ -121,7 +118,7 @@ |
|
@DTRACE_NEEDS_OBJECTS_TRUE@am__append_12 = libmemcached/libmemcached_probes.o |
|
@DTRACE_NEEDS_OBJECTS_TRUE@am__append_13 = libmemcached/libmemcached_probes.o |
|
@HAVE_SASL_TRUE@am__append_14 = $(LIBSASL) |
|
-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_15 = clients/memslap |
|
+@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_15 = |
|
@BUILD_BYTEORDER_TRUE@am__append_16 = libmemcached/libbyteorder.la |
|
@INCLUDE_HSIEH_SRC_TRUE@am__append_17 = libhashkit/hsieh.c |
|
@HAVE_LIBGTEST_TRUE@am__append_18 = unittests/unittests |
|
@@ -389,7 +386,7 @@ |
|
tests_libtest_la_LIBADD = |
|
am_tests_libtest_la_OBJECTS = tests/test.lo |
|
tests_libtest_la_OBJECTS = $(am_tests_libtest_la_OBJECTS) |
|
-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memslap$(EXEEXT) |
|
+@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = |
|
@HAVE_LIBGTEST_TRUE@am__EXEEXT_2 = unittests/unittests$(EXEEXT) |
|
@HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT) |
|
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) |
|
Index: memcached-1.4.5/configure |
|
--- memcached-1.4.5/configure.orig 2010-04-03 23:26:12.000000000 +0200 |
|
+++ memcached-1.4.5/configure 2010-09-29 19:43:23.000000000 +0200 |
|
@@ -7914,7 +7914,6 @@ |
|
elif test "$GCC" = "yes" |
|
then |
|
GCC_VERSION=`$CC -dumpversion` |
|
- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" |
|
case $GCC_VERSION in |
|
4.4.*) |
|
CFLAGS="$CFLAGS -fno-strict-aliasing" |
|
Index: memcached-1.4.5/memcached.h |
|
--- memcached-1.4.5/memcached.h.orig 2010-04-03 09:07:16.000000000 +0200 |
|
+++ memcached-1.4.5/memcached.h 2010-09-29 19:42:31.000000000 +0200 |
|
@@ -12,6 +12,7 @@ |
|
#include <sys/types.h> |
|
#include <sys/socket.h> |
|
#include <sys/time.h> |
|
+#include <sys/socket.h> |
|
#include <netinet/in.h> |
|
#include <event.h> |
|
#include <netdb.h> |
|
Index: memcached-1.4.5/thread.c |
|
--- memcached-1.4.5/thread.c.orig 2010-04-03 09:07:16.000000000 +0200 |
|
+++ memcached-1.4.5/thread.c 2010-09-29 19:42:31.000000000 +0200 |
|
@@ -602,6 +602,7 @@ |
|
perror("Can't allocate thread descriptors"); |
|
exit(1); |
|
} |
|
+ memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads); |
|
|
|
dispatcher_thread.base = main_base; |
|
dispatcher_thread.thread_id = pthread_self();
|
|
|