1.0.17 Tue Apr 2 14:02:01 HST 2013 * Remove c++ namespace that was being exposed (the API should be plug compatible).. * Fix cases where --servers wasn't behaving the same in all clients. 1.0.16 Thu Jan 31 19:14:32 EST 2013 * Added support to do two part shutdown of socket. * Fixes for Fedora 18. * Fix for binary memcached_touch() 1.0.15 Mon Dec 17 07:25:44 EST 2012 * Added support for Murmur3 (HASHKIT_HASH_MURMUR3) * Portability fixes. 1.0.14 Wed Nov 14 04:56:25 EST 2012 * CLIENT_ERROR fixed to not be treated as a fatal error. * Compiler fixes for older Ubuntu releases. 1.0.13 Fri Oct 19 00:09:28 EDT 2012 * Fix bug that caused version string to not be exported correctly. 1.0.12 Tue Oct 9 03:30:20 EDT 2012 * Added memcached_result_take_value(). * Added ax_libmemcached.m4 1.0.11 Sun Sep 16 20:32:13 EDT 2012 * Removed custom version of memcached. * Updated hardening rules. * Fixed a case where the return error from a socket connection differred from that of a TCP/IP socket. 1.0.10 Sun Jul 29 21:50:15 PDT 2012 * --disable-assert has been removed from configure, and --enable-assert has been added in its place. * Compiling fixes for Clang on OSX Mountain Lion. 1.0.9 Wed Jul 4 22:46:19 EDT 2012 * Faster close on socket. * Instance allocation is now seperated from server interface. This should allow for a better preservation of ABI compliance from now on. * Fix close on exec bug. * Numerous other bug fixes. 1.0.8 Tue May 22 15:06:04 EDT 2012 * Added support for setting options via ENV variable LIBMEMCACHED * Fix corner case on last used result. 1.0.7 Sat Apr 28 00:48:29 PDT 2012 * Add API call for exist calls. * Update all license files to be BSD. 1.0.6 Sat Apr 7 18:26:49 PDT 2012 * Fixes for gcc 4.7, lp:961812 * Fix for restart issue that happens under testing. * Fix for lp:962815. * Support for transparent AES encryption. 1.0.5 Tue Mar 13 22:56:47 PDT 2012 * Fixes for OSX. * Version is now parsed directly in the parser, which makes buffered operations now work with it.. * memstat has been extended so that it can be used to find the version of the server. * Update documentation. * Fixes for compile issues on Debian and Ubuntu 1.0.4 Thu Jan 26 22:33:54 PST 2012 * Fix for memcached_dump(). * Additional testing for memcached_stat_execute().diff -r1.6 -r1.7 pkgsrc/devel/libmemcached/Makefile
(fhajny)
@@ -1,33 +1,34 @@ | @@ -1,33 +1,34 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2013/05/04 12:43:50 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2013/09/12 14:20:56 fhajny Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= libmemcached-1.0.4 | 4 | DISTNAME= libmemcached-1.0.17 | |
5 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
6 | MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION}/+download/ | 6 | MASTER_SITES= http://launchpad.net/libmemcached/1.0/${PKGVERSION_NOREV}/+download/ | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://libmemcached.org/ | 9 | HOMEPAGE= http://libmemcached.org/ | |
10 | COMMENT= C/C++ client library and tools for the memcached server | 10 | COMMENT= C/C++ client library and tools for the memcached server | |
11 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
12 | 12 | |||
13 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
14 | USE_TOOLS+= pkg-config gmake | 14 | USE_TOOLS+= pkg-config gmake | |
15 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | 17 | |||
18 | PKGCONFIG_OVERRIDE+= support/libmemcached.pc.in | 18 | PKGCONFIG_OVERRIDE+= support/libmemcached.pc.in | |
19 | 19 | |||
20 | .include "../../mk/bsd.prefs.mk" | 20 | .include "../../mk/bsd.prefs.mk" | |
21 | # Avoid building 64bit on a 32bit bootstrap (affects SunOS) | 21 | .include "options.mk" | |
22 | .if defined(ABI) && empty(ABI:M64) | 22 | ||
23 | CONFIGURE_ARGS+= --disable-64bit | 23 | CONFIGURE_ARGS+=--enable-jobserver=no | |
24 | .endif | |||
25 | ||||
26 | # for backtrace | |||
27 | .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) | |||
28 | LIBS+= -lexecinfo | |||
29 | .endif | |||
30 | 24 | |||
31 | CPPFLAGS+= -D__STDC_FORMAT_MACROS | 25 | CPPFLAGS+= -D__STDC_FORMAT_MACROS | |
32 | 26 | |||
27 | LIBS.SunOS+= -lsocket | |||
28 | ||||
29 | post-configure: | |||
30 | ${ECHO} '#define HAVE_MEMCACHED_BINARY 1' >> ${WRKSRC}/mem_config.h | |||
31 | ${ECHO} '#define MEMCACHED_BINARY "${PREFIX}/bin/memcached"' >> ${WRKSRC}/mem_config.h | |||
32 | ||||
33 | .include "../../devel/libexecinfo/buildlink3.mk" | |||
33 | .include "../../mk/bsd.pkg.mk" | 34 | .include "../../mk/bsd.pkg.mk" |
@@ -1,53 +1,55 @@ | @@ -1,53 +1,55 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2012/02/07 11:34:00 fhajny Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2013/09/12 14:20:56 fhajny Exp $ | |
2 | bin/memcapable | 2 | bin/memcapable | |
3 | bin/memcat | 3 | bin/memcat | |
4 | bin/memcp | 4 | bin/memcp | |
5 | bin/memdump | 5 | bin/memdump | |
6 | bin/memerror | 6 | bin/memerror | |
7 | bin/memexist | 7 | bin/memexist | |
8 | bin/memflush | 8 | bin/memflush | |
9 | bin/memparse | 9 | bin/memparse | |
10 | bin/memping | 10 | bin/memping | |
11 | bin/memrm | 11 | bin/memrm | |
12 | bin/memslap | 12 | bin/memslap | |
13 | bin/memstat | 13 | bin/memstat | |
14 | bin/memtouch | 14 | bin/memtouch | |
15 | include/libhashkit-1.0/algorithm.h | 15 | include/libhashkit-1.0/algorithm.h | |
16 | include/libhashkit-1.0/behavior.h | 16 | include/libhashkit-1.0/behavior.h | |
17 | include/libhashkit-1.0/configure.h | 17 | include/libhashkit-1.0/configure.h | |
18 | include/libhashkit-1.0/digest.h | 18 | include/libhashkit-1.0/digest.h | |
19 | include/libhashkit-1.0/function.h | 19 | include/libhashkit-1.0/function.h | |
20 | include/libhashkit-1.0/has.h | 20 | include/libhashkit-1.0/has.h | |
21 | include/libhashkit-1.0/hashkit.h | 21 | include/libhashkit-1.0/hashkit.h | |
22 | include/libhashkit-1.0/hashkit.hpp | 22 | include/libhashkit-1.0/hashkit.hpp | |
23 | include/libhashkit-1.0/str_algorithm.h | 23 | include/libhashkit-1.0/str_algorithm.h | |
24 | include/libhashkit-1.0/strerror.h | 24 | include/libhashkit-1.0/strerror.h | |
25 | include/libhashkit-1.0/string.h | |||
25 | include/libhashkit-1.0/types.h | 26 | include/libhashkit-1.0/types.h | |
26 | include/libhashkit-1.0/visibility.h | 27 | include/libhashkit-1.0/visibility.h | |
27 | include/libhashkit/hashkit.h | 28 | include/libhashkit/hashkit.h | |
28 | include/libmemcached-1.0/alloc.h | 29 | include/libmemcached-1.0/alloc.h | |
29 | include/libmemcached-1.0/allocators.h | 30 | include/libmemcached-1.0/allocators.h | |
30 | include/libmemcached-1.0/analyze.h | 31 | include/libmemcached-1.0/analyze.h | |
31 | include/libmemcached-1.0/auto.h | 32 | include/libmemcached-1.0/auto.h | |
32 | include/libmemcached-1.0/basic_string.h | 33 | include/libmemcached-1.0/basic_string.h | |
33 | include/libmemcached-1.0/behavior.h | 34 | include/libmemcached-1.0/behavior.h | |
34 | include/libmemcached-1.0/callback.h | 35 | include/libmemcached-1.0/callback.h | |
35 | include/libmemcached-1.0/callbacks.h | 36 | include/libmemcached-1.0/callbacks.h | |
36 | include/libmemcached-1.0/configure.h | 37 | include/libmemcached-1.0/configure.h | |
37 | include/libmemcached-1.0/defaults.h | 38 | include/libmemcached-1.0/defaults.h | |
38 | include/libmemcached-1.0/delete.h | 39 | include/libmemcached-1.0/delete.h | |
39 | include/libmemcached-1.0/deprecated_types.h | 40 | include/libmemcached-1.0/deprecated_types.h | |
40 | include/libmemcached-1.0/dump.h | 41 | include/libmemcached-1.0/dump.h | |
42 | include/libmemcached-1.0/encoding_key.h | |||
41 | include/libmemcached-1.0/error.h | 43 | include/libmemcached-1.0/error.h | |
42 | include/libmemcached-1.0/exception.hpp | 44 | include/libmemcached-1.0/exception.hpp | |
43 | include/libmemcached-1.0/exist.h | 45 | include/libmemcached-1.0/exist.h | |
44 | include/libmemcached-1.0/fetch.h | 46 | include/libmemcached-1.0/fetch.h | |
45 | include/libmemcached-1.0/flush.h | 47 | include/libmemcached-1.0/flush.h | |
46 | include/libmemcached-1.0/flush_buffers.h | 48 | include/libmemcached-1.0/flush_buffers.h | |
47 | include/libmemcached-1.0/get.h | 49 | include/libmemcached-1.0/get.h | |
48 | include/libmemcached-1.0/hash.h | 50 | include/libmemcached-1.0/hash.h | |
49 | include/libmemcached-1.0/limits.h | 51 | include/libmemcached-1.0/limits.h | |
50 | include/libmemcached-1.0/memcached.h | 52 | include/libmemcached-1.0/memcached.h | |
51 | include/libmemcached-1.0/memcached.hpp | 53 | include/libmemcached-1.0/memcached.hpp | |
52 | include/libmemcached-1.0/options.h | 54 | include/libmemcached-1.0/options.h | |
53 | include/libmemcached-1.0/parse.h | 55 | include/libmemcached-1.0/parse.h | |
@@ -75,52 +77,51 @@ include/libmemcached-1.0/triggers.h | @@ -75,52 +77,51 @@ include/libmemcached-1.0/triggers.h | |||
75 | include/libmemcached-1.0/types.h | 77 | include/libmemcached-1.0/types.h | |
76 | include/libmemcached-1.0/types/behavior.h | 78 | include/libmemcached-1.0/types/behavior.h | |
77 | include/libmemcached-1.0/types/callback.h | 79 | include/libmemcached-1.0/types/callback.h | |
78 | include/libmemcached-1.0/types/connection.h | 80 | include/libmemcached-1.0/types/connection.h | |
79 | include/libmemcached-1.0/types/hash.h | 81 | include/libmemcached-1.0/types/hash.h | |
80 | include/libmemcached-1.0/types/return.h | 82 | include/libmemcached-1.0/types/return.h | |
81 | include/libmemcached-1.0/types/server_distribution.h | 83 | include/libmemcached-1.0/types/server_distribution.h | |
82 | include/libmemcached-1.0/verbosity.h | 84 | include/libmemcached-1.0/verbosity.h | |
83 | include/libmemcached-1.0/version.h | 85 | include/libmemcached-1.0/version.h | |
84 | include/libmemcached-1.0/visibility.h | 86 | include/libmemcached-1.0/visibility.h | |
85 | include/libmemcached/memcached.h | 87 | include/libmemcached/memcached.h | |
86 | include/libmemcached/memcached.hpp | 88 | include/libmemcached/memcached.hpp | |
87 | include/libmemcached/util.h | 89 | include/libmemcached/util.h | |
88 | include/libmemcachedprotocol-0.0/binary.h | |||
89 | include/libmemcachedprotocol-0.0/callback.h | |||
90 | include/libmemcachedprotocol-0.0/handler.h | |||
91 | include/libmemcachedprotocol-0.0/vbucket.h | |||
92 | include/libmemcachedutil-1.0/flush.h | 90 | include/libmemcachedutil-1.0/flush.h | |
93 | include/libmemcachedutil-1.0/ostream.hpp | 91 | include/libmemcachedutil-1.0/ostream.hpp | |
94 | include/libmemcachedutil-1.0/pid.h | 92 | include/libmemcachedutil-1.0/pid.h | |
95 | include/libmemcachedutil-1.0/ping.h | 93 | include/libmemcachedutil-1.0/ping.h | |
96 | include/libmemcachedutil-1.0/pool.h | 94 | include/libmemcachedutil-1.0/pool.h | |
97 | include/libmemcachedutil-1.0/util.h | 95 | include/libmemcachedutil-1.0/util.h | |
98 | include/libmemcachedutil-1.0/version.h | 96 | include/libmemcachedutil-1.0/version.h | |
99 | lib/libhashkit.la | 97 | lib/libhashkit.la | |
100 | lib/libmemcached.la | 98 | lib/libmemcached.la | |
101 | lib/libmemcachedprotocol.la | |||
102 | lib/libmemcachedutil.la | 99 | lib/libmemcachedutil.la | |
103 | lib/pkgconfig/libmemcached.pc | 100 | lib/pkgconfig/libmemcached.pc | |
104 | man/man1/memaslap.1 | 101 | man/man1/memaslap.1 | |
105 | man/man1/memcapable.1 | 102 | man/man1/memcapable.1 | |
106 | man/man1/memcat.1 | 103 | man/man1/memcat.1 | |
107 | man/man1/memcp.1 | 104 | man/man1/memcp.1 | |
108 | man/man1/memdump.1 | 105 | man/man1/memdump.1 | |
109 | man/man1/memerror.1 | 106 | man/man1/memerror.1 | |
107 | man/man1/memexist.1 | |||
110 | man/man1/memflush.1 | 108 | man/man1/memflush.1 | |
109 | man/man1/memparse.1 | |||
110 | man/man1/memping.1 | |||
111 | man/man1/memrm.1 | 111 | man/man1/memrm.1 | |
112 | man/man1/memslap.1 | 112 | man/man1/memslap.1 | |
113 | man/man1/memstat.1 | 113 | man/man1/memstat.1 | |
114 | man/man1/memtouch.1 | |||
114 | man/man3/hashkit_clone.3 | 115 | man/man3/hashkit_clone.3 | |
115 | man/man3/hashkit_crc32.3 | 116 | man/man3/hashkit_crc32.3 | |
116 | man/man3/hashkit_create.3 | 117 | man/man3/hashkit_create.3 | |
117 | man/man3/hashkit_fnv1_32.3 | 118 | man/man3/hashkit_fnv1_32.3 | |
118 | man/man3/hashkit_fnv1_64.3 | 119 | man/man3/hashkit_fnv1_64.3 | |
119 | man/man3/hashkit_fnv1a_32.3 | 120 | man/man3/hashkit_fnv1a_32.3 | |
120 | man/man3/hashkit_fnv1a_64.3 | 121 | man/man3/hashkit_fnv1a_64.3 | |
121 | man/man3/hashkit_free.3 | 122 | man/man3/hashkit_free.3 | |
122 | man/man3/hashkit_functions.3 | 123 | man/man3/hashkit_functions.3 | |
123 | man/man3/hashkit_hsieh.3 | 124 | man/man3/hashkit_hsieh.3 | |
124 | man/man3/hashkit_is_allocated.3 | 125 | man/man3/hashkit_is_allocated.3 | |
125 | man/man3/hashkit_jenkins.3 | 126 | man/man3/hashkit_jenkins.3 | |
126 | man/man3/hashkit_md5.3 | 127 | man/man3/hashkit_md5.3 | |
@@ -204,13 +205,14 @@ man/man3/memcached_set_by_key.3 | @@ -204,13 +205,14 @@ man/man3/memcached_set_by_key.3 | |||
204 | man/man3/memcached_set_memory_allocators.3 | 205 | man/man3/memcached_set_memory_allocators.3 | |
205 | man/man3/memcached_set_sasl_callbacks.3 | 206 | man/man3/memcached_set_sasl_callbacks.3 | |
206 | man/man3/memcached_set_user_data.3 | 207 | man/man3/memcached_set_user_data.3 | |
207 | man/man3/memcached_stat.3 | 208 | man/man3/memcached_stat.3 | |
208 | man/man3/memcached_stat_execute.3 | 209 | man/man3/memcached_stat_execute.3 | |
209 | man/man3/memcached_stat_get_keys.3 | 210 | man/man3/memcached_stat_get_keys.3 | |
210 | man/man3/memcached_stat_get_value.3 | 211 | man/man3/memcached_stat_get_value.3 | |
211 | man/man3/memcached_stat_servername.3 | 212 | man/man3/memcached_stat_servername.3 | |
212 | man/man3/memcached_strerror.3 | 213 | man/man3/memcached_strerror.3 | |
213 | man/man3/memcached_touch.3 | 214 | man/man3/memcached_touch.3 | |
214 | man/man3/memcached_touch_by_key.3 | 215 | man/man3/memcached_touch_by_key.3 | |
215 | man/man3/memcached_verbosity.3 | 216 | man/man3/memcached_verbosity.3 | |
216 | man/man3/memcached_version.3 | 217 | man/man3/memcached_version.3 | |
218 | share/aclocal/ax_libmemcached.m4 |
@@ -1,8 +1,12 @@ | @@ -1,8 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2013/06/04 21:17:17 fhajny Exp $ | 1 | $NetBSD: distinfo,v 1.5 2013/09/12 14:20:56 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (libmemcached-1.0.4.tar.gz) = a74644a368b14954c80623879bd722ebf552f857 | 3 | SHA1 (libmemcached-1.0.17.tar.gz) = 1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8 | |
4 | RMD160 (libmemcached-1.0.4.tar.gz) = 2a9c71cd7894ed1c55d2557fd71fc75b5bc54ceb | 4 | RMD160 (libmemcached-1.0.17.tar.gz) = f0e617e0dc5f2eb27f9da7ea5a9f5a7b043b80a8 | |
5 | Size (libmemcached-1.0.4.tar.gz) = 951310 bytes | 5 | Size (libmemcached-1.0.17.tar.gz) = 1023177 bytes | |
6 | SHA1 (patch-configure) = 9bda748d780dc2b3d0f114e302c04a5f5d3b0eee | 6 | SHA1 (patch-libmemcached-1.0_deprecated__types.h) = 9dcb5a508df69f0959e2b7a34f20ff8311cd41de | |
7 | SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 80a4d84457659dfc22c9004469426ba1c35a6f73 | 7 | SHA1 (patch-libmemcached_byteorder.cc) = 18d5b6447e7457bf35dbac6c693735932871f095 | |
8 | SHA1 (patch-tests_libmemcached-1.0_pool.cc) = b222a16d3ef03a9d60379aeacb10a205961732e0 | 8 | SHA1 (patch-libtest_lite.h) = 6460bd76650111613311c35d3d836674dab0c801 | |
9 | SHA1 (patch-libtest_main.cc) = e9c2d88085f2a66b3296f7acd40484e485fd3c16 | |||
10 | SHA1 (patch-libtest_test.hpp) = 684d1dcfe5c6a4b510353bd578c8919da216542b | |||
11 | SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 8dacea6366738254e1a71eef8cd4e04329f4e53c | |||
12 | SHA1 (patch-tests_libmemcached-1.0_pool.cc) = d5656a54277f7155b1b78a0f90fd0f939ef39be6 |
$NetBSD: patch-libmemcached-1.0_deprecated__types.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
Add type to overcome a breaking API change.
https://bugs.launchpad.net/libmemcached/+bug/1190240
--- libmemcached-1.0/deprecated_types.h.orig 2013-04-03 04:22:00.000000000 +0000
+++ libmemcached-1.0/deprecated_types.h
@@ -57,4 +57,5 @@ typedef memcached_server_fn memcached_se
typedef memcached_trigger_key_fn memcached_trigger_key;
typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
typedef memcached_dump_fn memcached_dump_func;
+typedef memcached_instance_st memcached_server_instance_st;
$NetBSD: patch-libmemcached_byteorder.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
Need ntohll/htonll defined.
--- libmemcached/byteorder.cc.orig 2013-04-03 04:22:00.000000000 +0000
+++ libmemcached/byteorder.cc
@@ -36,6 +36,9 @@
*/
#include "mem_config.h"
+#ifdef __sun
+# include "sys/byteorder.h"
+#endif
#include "libmemcached/byteorder.h"
/* Byte swap a 64-bit number. */
$NetBSD: patch-libtest_lite.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
NetBSD doesn't have alloca.h.
--- libtest/lite.h.orig 2013-04-03 04:22:00.000000000 +0000
+++ libtest/lite.h
@@ -53,7 +53,7 @@
#if defined(_WIN32)
# include <malloc.h>
-#else
+#elif !defined(__NetBSD__)
# include <alloca.h>
#endif
$NetBSD: patch-libtest_main.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
strings.h needed for rindex.
--- libtest/main.cc.orig 2013-04-03 04:22:00.000000000 +0000
+++ libtest/main.cc
@@ -45,6 +45,7 @@
#include <iostream>
#include <fstream>
#include <memory>
+#include <strings.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
$NetBSD: patch-libtest_test.hpp,v 1.1 2013/09/12 14:20:56 fhajny Exp $
cstdarg needed for va_start.
--- libtest/test.hpp.orig 2013-04-03 04:22:00.000000000 +0000
+++ libtest/test.hpp
@@ -57,6 +57,7 @@
#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
+#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <arpa/inet.h>
@@ -1,20 +1,21 @@ | @@ -1,20 +1,21 @@ | |||
1 | $NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $ | 1 | $NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $ | |
2 | 2 | |||
3 | --- tests/libmemcached-1.0/ketama.cc.orig 2013-05-05 20:35:41.000000000 +0000 | 3 | Use stdint. | |
4 | --- tests/libmemcached-1.0/ketama.cc.orig 2013-04-03 04:22:00.000000000 +0000 | |||
4 | +++ tests/libmemcached-1.0/ketama.cc | 5 | +++ tests/libmemcached-1.0/ketama.cc | |
5 | @@ -33,6 +33,7 @@ | 6 | @@ -33,6 +33,7 @@ | |
6 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 7 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
7 | * | 8 | * | |
8 | */ | 9 | */ | |
9 | +#define __STDC_CONSTANT_MACROS | 10 | +#define __STDC_CONSTANT_MACROS | |
10 | 11 | |||
11 | #include <config.h> | 12 | #include <mem_config.h> | |
12 | #include <libtest/test.hpp> | 13 | #include <libtest/test.hpp> | |
13 | @@ -43,6 +44,7 @@ | 14 | @@ -45,6 +46,7 @@ | |
14 | 15 | |||
15 | #include <tests/ketama.h> | 16 | #include <tests/ketama.h> | |
16 | #include <tests/ketama_test_cases.h> | 17 | #include <tests/ketama_test_cases.h> | |
17 | +#include <stdint.h> | 18 | +#include <stdint.h> | |
18 | 19 | |||
19 | test_return_t ketama_compatibility_libmemcached(memcached_st *) | 20 | test_return_t ketama_compatibility_libmemcached(memcached_st *) | |
20 | { | 21 | { |
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | $NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $ | 1 | $NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $ | |
2 | 2 | |||
3 | --- tests/libmemcached-1.0/pool.cc.orig 2013-05-05 20:36:30.000000000 +0000 | 3 | Use stdint. | |
4 | --- tests/libmemcached-1.0/pool.cc.orig 2013-04-03 04:22:00.000000000 +0000 | |||
4 | +++ tests/libmemcached-1.0/pool.cc | 5 | +++ tests/libmemcached-1.0/pool.cc | |
5 | @@ -34,7 +34,7 @@ | 6 | @@ -34,6 +34,7 @@ | |
6 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 7 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
7 | * | 8 | * | |
8 | */ | 9 | */ | |
9 | - | |||
10 | +#define __STDC_CONSTANT_MACROS | 10 | +#define __STDC_CONSTANT_MACROS | |
11 | #include <config.h> | |||
12 | #include <libtest/test.hpp> | |||
13 | 11 | |||
14 | @@ -44,6 +44,7 @@ using namespace libtest; | 12 | #include <mem_config.h> | |
13 | #include <libtest/test.hpp> | |||
14 | @@ -44,6 +45,7 @@ using namespace libtest; | |||
15 | #include <iostream> | 15 | #include <iostream> | |
16 | #include <string> | 16 | #include <string> | |
17 | #include <cerrno> | 17 | #include <cerrno> | |
18 | +#include <stdint.h> | 18 | +#include <stdint.h> | |
19 | 19 | |||
20 | #include <semaphore.h> | 20 | #include <semaphore.h> | |
21 | 21 |