From: Continuous Integration Date: Sat, 13 Oct 2012 11:30:22 +0000 (-0400) Subject: Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-63 X-Git-Tag: 1.0.13~6 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=8cf5f36e16ecaf6e1e7622a3a7cad81491602b0d;hp=665b01c5c9e427b37f639f60bf336e4083cc14a7;p=awesomized%2Flibmemcached Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-63 --- diff --git a/Makefile.am b/Makefile.am index 08d36a4b..cc6bc018 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,7 @@ include libmemcachedprotocol/include.am include libmemcachedinternal/include.am include libmemcachedinternal/util/include.am include poll/include.am -include rpm.am +include rpm/include.am include support/include.am include tests/include.am include util/include.am diff --git a/clients/execute.cc b/clients/execute.cc index f877851e..cf7779e5 100644 --- a/clients/execute.cc +++ b/clients/execute.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * diff --git a/clients/execute.h b/clients/execute.h index 05678c4d..ebf92f62 100644 --- a/clients/execute.h +++ b/clients/execute.h @@ -13,7 +13,7 @@ #include -#include "libmemcached/memcached.h" +#include #include "clients/generator.h" #ifdef __cplusplus diff --git a/clients/generator.cc b/clients/generator.cc index d24ad139..e41d9c58 100644 --- a/clients/generator.cc +++ b/clients/generator.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * diff --git a/clients/include.am b/clients/include.am index aeda9f85..98319e1e 100644 --- a/clients/include.am +++ b/clients/include.am @@ -2,28 +2,27 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -CLIENTS_LDADDS= \ - clients/libutilities.la \ - libmemcached/libmemcached.la +CLIENTS_LDADDS= +CLIENTS_LDADDS+= clients/libutilities.la +CLIENTS_LDADDS+= libmemcached/libmemcached.la if HAVE_SASL CLIENTS_LDADDS+= $(LIBSASL) endif -bin_PROGRAMS+= \ - clients/memcapable \ - clients/memcat \ - clients/memcp \ - clients/memdump \ - clients/memerror \ - clients/memexist \ - clients/memtouch \ - clients/memflush \ - clients/memparse \ - clients/memping \ - clients/memrm \ - clients/memslap \ - clients/memstat +bin_PROGRAMS+= clients/memcapable +bin_PROGRAMS+= clients/memcat +bin_PROGRAMS+= clients/memcp +bin_PROGRAMS+= clients/memdump +bin_PROGRAMS+= clients/memerror +bin_PROGRAMS+= clients/memexist +bin_PROGRAMS+= clients/memtouch +bin_PROGRAMS+= clients/memflush +bin_PROGRAMS+= clients/memparse +bin_PROGRAMS+= clients/memping +bin_PROGRAMS+= clients/memrm +bin_PROGRAMS+= clients/memslap +bin_PROGRAMS+= clients/memstat if BUILD_MEMASLAP if HAVE_LIBEVENT @@ -33,19 +32,18 @@ endif endif endif -noinst_HEADERS+= \ - clients/client_options.h \ - clients/execute.h \ - clients/generator.h \ - clients/ms_atomic.h \ - clients/ms_conn.h \ - clients/ms_memslap.h \ - clients/ms_setting.h \ - clients/ms_sigsegv.h \ - clients/ms_stats.h \ - clients/ms_task.h \ - clients/ms_thread.h \ - clients/utilities.h +noinst_HEADERS+= clients/client_options.h +noinst_HEADERS+= clients/execute.h +noinst_HEADERS+= clients/generator.h +noinst_HEADERS+= clients/ms_atomic.h +noinst_HEADERS+= clients/ms_conn.h +noinst_HEADERS+= clients/ms_memslap.h +noinst_HEADERS+= clients/ms_setting.h +noinst_HEADERS+= clients/ms_sigsegv.h +noinst_HEADERS+= clients/ms_stats.h +noinst_HEADERS+= clients/ms_task.h +noinst_HEADERS+= clients/ms_thread.h +noinst_HEADERS+= clients/utilities.h noinst_LTLIBRARIES+= clients/libutilities.la clients_libutilities_la_SOURCES= clients/utilities.cc @@ -89,20 +87,21 @@ clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS} clients_memslap_LDADD= $(CLIENTS_LDADDS) clients_memslap_LDADD+= $(PTHREAD_LIBS) -clients_memaslap_SOURCES= \ - clients/memaslap.c \ - clients/ms_conn.c \ - clients/ms_setting.c \ - clients/ms_sigsegv.c \ - clients/ms_stats.c \ - clients/ms_task.c \ - clients/ms_thread.c +clients_memaslap_SOURCES= +clients_memaslap_SOURCES+= clients/memaslap.c +clients_memaslap_SOURCES+= clients/ms_conn.c +clients_memaslap_SOURCES+= clients/ms_setting.c +clients_memaslap_SOURCES+= clients/ms_sigsegv.c +clients_memaslap_SOURCES+= clients/ms_stats.c +clients_memaslap_SOURCES+= clients/ms_task.c +clients_memaslap_SOURCES+= clients/ms_thread.c + clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS) -clients_memcapable_SOURCES= \ - clients/memcapable.cc \ - libmemcached/byteorder.cc +clients_memcapable_SOURCES= +clients_memcapable_SOURCES+= clients/memcapable.cc +clients_memcapable_SOURCES+= libmemcached/byteorder.cc clients_memcapable_LDADD= $(CLIENTS_LDADDS) test-start-server: diff --git a/clients/memcapable.cc b/clients/memcapable.cc index 25b470b0..2026acee 100644 --- a/clients/memcapable.cc +++ b/clients/memcapable.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -34,10 +35,11 @@ #include #include -#include -#include -#include -#include + +#include "libmemcached/socket.hpp" +#include "libmemcached/memcached/protocol_binary.h" +#include "libmemcached/byteorder.h" +#include "clients/utilities.h" #include diff --git a/clients/memcat.cc b/clients/memcat.cc index c93f1a21..ef287781 100644 --- a/clients/memcat.cc +++ b/clients/memcat.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -16,7 +17,7 @@ #include #include #include -#include +#include #include "utilities.h" diff --git a/clients/memcp.cc b/clients/memcp.cc index c56a79cd..4ad0919d 100644 --- a/clients/memcp.cc +++ b/clients/memcp.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -30,7 +31,7 @@ #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memdump.cc b/clients/memdump.cc index fded16f2..5b333728 100644 --- a/clients/memdump.cc +++ b/clients/memdump.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -24,7 +25,7 @@ #include #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memerror.cc b/clients/memerror.cc index 17bc531c..910b2a6d 100644 --- a/clients/memerror.cc +++ b/clients/memerror.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -20,7 +21,7 @@ #include #include -#include +#include #include "utilities.h" diff --git a/clients/memexist.cc b/clients/memexist.cc index c3871dea..af9a72c9 100644 --- a/clients/memexist.cc +++ b/clients/memexist.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -16,7 +17,7 @@ #include #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memflush.cc b/clients/memflush.cc index 81bb2574..5342d757 100644 --- a/clients/memflush.cc +++ b/clients/memflush.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -16,7 +17,7 @@ #include #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memparse.cc b/clients/memparse.cc index c2557dfd..ab4cee9e 100644 --- a/clients/memparse.cc +++ b/clients/memparse.cc @@ -2,7 +2,7 @@ * * Libmemcached library * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/clients/memping.cc b/clients/memping.cc index bcc07cd3..f4fcec86 100644 --- a/clients/memping.cc +++ b/clients/memping.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -14,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memrm.cc b/clients/memrm.cc index 61697cd1..3b7f8a4b 100644 --- a/clients/memrm.cc +++ b/clients/memrm.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -16,7 +17,7 @@ #include #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memslap.cc b/clients/memslap.cc index 8b694835..777820a0 100644 --- a/clients/memslap.cc +++ b/clients/memslap.cc @@ -2,7 +2,7 @@ * * Libmemcached library * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -55,7 +55,7 @@ #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memstat.cc b/clients/memstat.cc index 1eab6f9f..6fd42d6c 100644 --- a/clients/memstat.cc +++ b/clients/memstat.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -25,7 +26,7 @@ #include #include -#include +#include #include "client_options.h" #include "utilities.h" diff --git a/clients/memtouch.cc b/clients/memtouch.cc index 4f3be80e..8bb3c78c 100644 --- a/clients/memtouch.cc +++ b/clients/memtouch.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * @@ -16,7 +17,7 @@ #include #include #include -#include +#include #include "utilities.h" diff --git a/clients/utilities.cc b/clients/utilities.cc index bae94076..ddc83eda 100644 --- a/clients/utilities.cc +++ b/clients/utilities.cc @@ -1,4 +1,5 @@ /* LibMemcached + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2006-2009 Brian Aker * All rights reserved. * diff --git a/configure.ac b/configure.ac index ee2d417c..09d8ecb3 100644 --- a/configure.ac +++ b/configure.ac @@ -35,18 +35,22 @@ MEMCACHED_LIBRARY_VERSION=11:0:0 # | +- increment if source code has changed # | set to zero if current is incremented # +- increment if interfaces have been added, removed or changed -AC_SUBST(MEMCACHED_UTIL_LIBRARY_VERSION) -AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION) -AC_SUBST(MEMCACHED_LIBRARY_VERSION) +AC_SUBST([MEMCACHED_UTIL_LIBRARY_VERSION]) +AC_SUBST([MEMCACHED_PROTOCAL_LIBRARY_VERSION]) +AC_SUBST([MEMCACHED_LIBRARY_VERSION]) -HASHKIT_LIBRARY_VERSION=2:0:0 -AC_SUBST(HASHKIT_LIBRARY_VERSION) +AX_HEX_VERSION([LIBMEMCACHED],[$VERSION]) +AX_HEX_VERSION([LIBHASHKIT],[1.0.0]) + +m4_include([libhashkit/include.m4]) LT_PREREQ([2.2]) LT_INIT LT_LANG([C++]) + +AX_PLATFORM + gl_VISIBILITY -PANDORA_PLATFORM m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AX_CXX_HEADER_STDCXX_98 @@ -196,12 +200,12 @@ AC_CHECK_LIB([rt], [clock_gettime], [ ]) # Check for the ability to call dlopen -AC_CHECK_LIB([dl], [dlopen],[ +AC_CHECK_LIB([dl], [dlopen], [ DL_LIB="-ldl" - AC_SUBST(DL_LIB) - AC_DEFINE([HAVE_LIBDL], [ 1 ], [Have dlopen]) + AC_SUBST([DL_LIB]) + AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen]) ],[ - AC_DEFINE([HAVE_LIBDL], [ 0 ], [Have dlopen]) + AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen]) ]) AC_CHECK_LIB([m], [floor]) @@ -209,8 +213,8 @@ AC_CHECK_FUNCS([sigignore]) AC_CHECK_HEADERS([atomic.h]) AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[ - AC_CHECK_FUNCS(atomic_add_64) - AC_CHECK_FUNCS(atomic_add_32) + AC_CHECK_FUNCS([atomic_add_64]) + AC_CHECK_FUNCS([atomic_add_32]) AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],[ AC_DEFINE([USE_ATOMIC_H], [1], @@ -232,8 +236,8 @@ dnl If you want to add support for other platforms you should check for dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add dnl the source file containing the implementation into memcached_SOURCE dnl in Makefile.am -AC_CHECK_FUNCS(setppriv, [ - AC_CHECK_HEADER(priv.h, [ +AC_CHECK_FUNCS([setppriv], [ + AC_CHECK_HEADER([priv.h], [ AC_DEFINE([HAVE_DROP_PRIVILEGES], 1, [Define this if you have an implementation of drop_privileges()]) build_solaris_privs=yes @@ -268,10 +272,7 @@ AX_AM_JOBSERVER([yes]) AC_CONFIG_FILES([ Makefile docs/conf.py - libhashkit-1.0/configure.h libmemcached-1.0/configure.h - libmemcached-1.2/configure.h - libmemcached-2.0/configure.h support/libmemcached.pc support/libmemcached.spec ]) diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc index e76841a1..c5956b24 100644 --- a/example/t/memcached_light.cc +++ b/example/t/memcached_light.cc @@ -42,7 +42,7 @@ #include #include -#include +#include #include "tests/libmemcached-1.0/memcached_get.h" diff --git a/libhashkit-1.0/configure.h.in b/libhashkit-1.0/configure.h.in index 8aec3865..4fab993d 100644 --- a/libhashkit-1.0/configure.h.in +++ b/libhashkit-1.0/configure.h.in @@ -1,4 +1,5 @@ /* HashKit + * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/ * Copyright (C) 2009-2010 Brian Aker * All rights reserved. * @@ -8,6 +9,9 @@ #pragma once +#define LIBHASHKIT_VERSION_STRING "@LIBHASHKIT_VERSION_STRING@" +#define LIBHASHKIT_VERSION_HEX @LIBHASHKIT_VERSION_HEX@ + #ifdef __cplusplus extern "C" { #endif diff --git a/libhashkit-1.0/include.am b/libhashkit-1.0/include.am index a5f849c8..6e60d745 100644 --- a/libhashkit-1.0/include.am +++ b/libhashkit-1.0/include.am @@ -6,18 +6,16 @@ EXTRA_DIST+= libhashkit-1.0/configure.h.in BUILT_SOURCES+= libhashkit-1.0/configure.h -nobase_include_HEADERS+= \ - libhashkit-1.0/algorithm.h \ - libhashkit-1.0/behavior.h \ - libhashkit-1.0/configure.h \ - libhashkit-1.0/digest.h \ - libhashkit-1.0/function.h \ - libhashkit-1.0/has.h \ - libhashkit-1.0/hashkit.h \ - libhashkit-1.0/hashkit.hpp \ - libhashkit-1.0/strerror.h \ - libhashkit-1.0/string.h \ - libhashkit-1.0/str_algorithm.h \ - libhashkit-1.0/types.h \ - libhashkit-1.0/visibility.h - +nobase_include_HEADERS+= libhashkit-1.0/algorithm.h +nobase_include_HEADERS+= libhashkit-1.0/behavior.h +nobase_include_HEADERS+= libhashkit-1.0/configure.h +nobase_include_HEADERS+= libhashkit-1.0/digest.h +nobase_include_HEADERS+= libhashkit-1.0/function.h +nobase_include_HEADERS+= libhashkit-1.0/has.h +nobase_include_HEADERS+= libhashkit-1.0/hashkit.h +nobase_include_HEADERS+= libhashkit-1.0/hashkit.hpp +nobase_include_HEADERS+= libhashkit-1.0/strerror.h +nobase_include_HEADERS+= libhashkit-1.0/string.h +nobase_include_HEADERS+= libhashkit-1.0/str_algorithm.h +nobase_include_HEADERS+= libhashkit-1.0/types.h +nobase_include_HEADERS+= libhashkit-1.0/visibility.h diff --git a/libhashkit/include.m4 b/libhashkit/include.m4 new file mode 100644 index 00000000..eb85c05b --- /dev/null +++ b/libhashkit/include.m4 @@ -0,0 +1,9 @@ +dnl Copyright (C) 2012 Data Differential, LLC. +dnl This file is free software; Data Differential, LLC. +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +HASHKIT_LIBRARY_VERSION=2:0:0 +AC_SUBST(HASHKIT_LIBRARY_VERSION) + +AC_CONFIG_FILES([libhashkit-1.0/configure.h]) diff --git a/libmemcached-1.0/configure.h.in b/libmemcached-1.0/configure.h.in index 7b48be2a..3f0465a0 100644 --- a/libmemcached-1.0/configure.h.in +++ b/libmemcached-1.0/configure.h.in @@ -44,8 +44,8 @@ extern "C" { @DEPRECATED@ @LIBMEMCACHED_WITH_SASL_SUPPORT@ -#define LIBMEMCACHED_VERSION_STRING "@VERSION@" -#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@ +#define LIBMEMCACHED_VERSION_STRING "@LIBMEMCACHED_VERSION_STRING@" +#define LIBMEMCACHED_VERSION_HEX @LIBMEMCACHED_VERSION_HEX@ #ifdef __cplusplus } diff --git a/libmemcached-1.0/include.am b/libmemcached-1.0/include.am index a5cd175b..19e48289 100644 --- a/libmemcached-1.0/include.am +++ b/libmemcached-1.0/include.am @@ -11,47 +11,46 @@ include libmemcached-1.0/types/include.am # Tests for this version of the interface include libmemcached-1.0/t/include.am -nobase_include_HEADERS+= \ - libmemcached-1.0/alloc.h \ - libmemcached-1.0/allocators.h \ - libmemcached-1.0/analyze.h \ - libmemcached-1.0/auto.h \ - libmemcached-1.0/basic_string.h \ - libmemcached-1.0/behavior.h \ - libmemcached-1.0/callback.h \ - libmemcached-1.0/callbacks.h \ - libmemcached-1.0/configure.h \ - libmemcached-1.0/defaults.h \ - libmemcached-1.0/delete.h \ - libmemcached-1.0/deprecated_types.h \ - libmemcached-1.0/dump.h \ - libmemcached-1.0/encoding_key.h \ - libmemcached-1.0/error.h \ - libmemcached-1.0/exception.hpp \ - libmemcached-1.0/exist.h \ - libmemcached-1.0/fetch.h \ - libmemcached-1.0/flush.h \ - libmemcached-1.0/flush_buffers.h \ - libmemcached-1.0/get.h \ - libmemcached-1.0/hash.h \ - libmemcached-1.0/limits.h \ - libmemcached-1.0/memcached.h \ - libmemcached-1.0/memcached.hpp \ - libmemcached-1.0/options.h \ - libmemcached-1.0/parse.h \ - libmemcached-1.0/platform.h \ - libmemcached-1.0/quit.h \ - libmemcached-1.0/result.h \ - libmemcached-1.0/return.h \ - libmemcached-1.0/sasl.h \ - libmemcached-1.0/server.h \ - libmemcached-1.0/server_list.h \ - libmemcached-1.0/stats.h \ - libmemcached-1.0/storage.h \ - libmemcached-1.0/strerror.h \ - libmemcached-1.0/touch.h \ - libmemcached-1.0/triggers.h \ - libmemcached-1.0/types.h \ - libmemcached-1.0/verbosity.h \ - libmemcached-1.0/version.h \ - libmemcached-1.0/visibility.h +nobase_include_HEADERS+= libmemcached-1.0/alloc.h +nobase_include_HEADERS+= libmemcached-1.0/allocators.h +nobase_include_HEADERS+= libmemcached-1.0/analyze.h +nobase_include_HEADERS+= libmemcached-1.0/auto.h +nobase_include_HEADERS+= libmemcached-1.0/basic_string.h +nobase_include_HEADERS+= libmemcached-1.0/behavior.h +nobase_include_HEADERS+= libmemcached-1.0/callback.h +nobase_include_HEADERS+= libmemcached-1.0/callbacks.h +nobase_include_HEADERS+= libmemcached-1.0/configure.h +nobase_include_HEADERS+= libmemcached-1.0/defaults.h +nobase_include_HEADERS+= libmemcached-1.0/delete.h +nobase_include_HEADERS+= libmemcached-1.0/deprecated_types.h +nobase_include_HEADERS+= libmemcached-1.0/dump.h +nobase_include_HEADERS+= libmemcached-1.0/encoding_key.h +nobase_include_HEADERS+= libmemcached-1.0/error.h +nobase_include_HEADERS+= libmemcached-1.0/exception.hpp +nobase_include_HEADERS+= libmemcached-1.0/exist.h +nobase_include_HEADERS+= libmemcached-1.0/fetch.h +nobase_include_HEADERS+= libmemcached-1.0/flush.h +nobase_include_HEADERS+= libmemcached-1.0/flush_buffers.h +nobase_include_HEADERS+= libmemcached-1.0/get.h +nobase_include_HEADERS+= libmemcached-1.0/hash.h +nobase_include_HEADERS+= libmemcached-1.0/limits.h +nobase_include_HEADERS+= libmemcached-1.0/memcached.h +nobase_include_HEADERS+= libmemcached-1.0/memcached.hpp +nobase_include_HEADERS+= libmemcached-1.0/options.h +nobase_include_HEADERS+= libmemcached-1.0/parse.h +nobase_include_HEADERS+= libmemcached-1.0/platform.h +nobase_include_HEADERS+= libmemcached-1.0/quit.h +nobase_include_HEADERS+= libmemcached-1.0/result.h +nobase_include_HEADERS+= libmemcached-1.0/return.h +nobase_include_HEADERS+= libmemcached-1.0/sasl.h +nobase_include_HEADERS+= libmemcached-1.0/server.h +nobase_include_HEADERS+= libmemcached-1.0/server_list.h +nobase_include_HEADERS+= libmemcached-1.0/stats.h +nobase_include_HEADERS+= libmemcached-1.0/storage.h +nobase_include_HEADERS+= libmemcached-1.0/strerror.h +nobase_include_HEADERS+= libmemcached-1.0/touch.h +nobase_include_HEADERS+= libmemcached-1.0/triggers.h +nobase_include_HEADERS+= libmemcached-1.0/types.h +nobase_include_HEADERS+= libmemcached-1.0/verbosity.h +nobase_include_HEADERS+= libmemcached-1.0/version.h +nobase_include_HEADERS+= libmemcached-1.0/visibility.h diff --git a/libmemcached-1.0/struct/include.am b/libmemcached-1.0/struct/include.am index eff3c520..fc2d9223 100644 --- a/libmemcached-1.0/struct/include.am +++ b/libmemcached-1.0/struct/include.am @@ -2,14 +2,12 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -nobase_include_HEADERS+= \ - libmemcached-1.0/struct/allocator.h \ - libmemcached-1.0/struct/analysis.h \ - libmemcached-1.0/struct/callback.h \ - libmemcached-1.0/struct/memcached.h \ - libmemcached-1.0/struct/result.h \ - libmemcached-1.0/struct/sasl.h \ - libmemcached-1.0/struct/server.h \ - libmemcached-1.0/struct/stat.h \ - libmemcached-1.0/struct/string.h - +nobase_include_HEADERS+= libmemcached-1.0/struct/allocator.h +nobase_include_HEADERS+= libmemcached-1.0/struct/analysis.h +nobase_include_HEADERS+= libmemcached-1.0/struct/callback.h +nobase_include_HEADERS+= libmemcached-1.0/struct/memcached.h +nobase_include_HEADERS+= libmemcached-1.0/struct/result.h +nobase_include_HEADERS+= libmemcached-1.0/struct/sasl.h +nobase_include_HEADERS+= libmemcached-1.0/struct/server.h +nobase_include_HEADERS+= libmemcached-1.0/struct/stat.h +nobase_include_HEADERS+= libmemcached-1.0/struct/string.h diff --git a/libmemcached-1.0/t/c_sasl_test.c b/libmemcached-1.0/t/c_sasl_test.c index 8a7c4e3d..93f729d1 100644 --- a/libmemcached-1.0/t/c_sasl_test.c +++ b/libmemcached-1.0/t/c_sasl_test.c @@ -44,7 +44,7 @@ #include #endif -#include +#include int main(void) { diff --git a/libmemcached-1.0/t/c_test.c b/libmemcached-1.0/t/c_test.c index 009014ee..40935fac 100644 --- a/libmemcached-1.0/t/c_test.c +++ b/libmemcached-1.0/t/c_test.c @@ -40,7 +40,7 @@ #include -#include +#include int main(void) { diff --git a/libmemcached-1.0/types/include.am b/libmemcached-1.0/types/include.am index d102c313..fa330469 100644 --- a/libmemcached-1.0/types/include.am +++ b/libmemcached-1.0/types/include.am @@ -1,9 +1,8 @@ # vim:ft=automake -nobase_include_HEADERS+= \ - libmemcached-1.0/types/behavior.h \ - libmemcached-1.0/types/callback.h \ - libmemcached-1.0/types/connection.h \ - libmemcached-1.0/types/hash.h \ - libmemcached-1.0/types/return.h \ - libmemcached-1.0/types/server_distribution.h +nobase_include_HEADERS+= libmemcached-1.0/types/behavior.h +nobase_include_HEADERS+= libmemcached-1.0/types/callback.h +nobase_include_HEADERS+= libmemcached-1.0/types/connection.h +nobase_include_HEADERS+= libmemcached-1.0/types/hash.h +nobase_include_HEADERS+= libmemcached-1.0/types/return.h +nobase_include_HEADERS+= libmemcached-1.0/types/server_distribution.h diff --git a/libmemcached-1.2/allocators.h b/libmemcached-1.2/allocators.h deleted file mode 100644 index 0fd7bef6..00000000 --- a/libmemcached-1.2/allocators.h +++ /dev/null @@ -1,54 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_set_memory_allocators(memcached_st *ptr, - memcached_malloc_fn mem_malloc, - memcached_free_fn mem_free, - memcached_realloc_fn mem_realloc, - memcached_calloc_fn mem_calloc, - void *context); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/auto.h b/libmemcached-1.2/auto.h deleted file mode 100644 index 13e0218d..00000000 --- a/libmemcached-1.2/auto.h +++ /dev/null @@ -1,111 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API - memcached_return_t memcached_increment(memcached_st *ptr, - const char *key, size_t key_length, - uint32_t offset, - uint64_t *value); -LIBMEMCACHED_API - memcached_return_t memcached_decrement(memcached_st *ptr, - const char *key, size_t key_length, - uint32_t offset, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_increment_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - uint64_t offset, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_decrement_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - uint64_t offset, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_increment_with_initial(memcached_st *ptr, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_decrement_with_initial(memcached_st *ptr, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, - const char *group_key, - size_t group_key_length, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); - -LIBMEMCACHED_API - memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, - const char *group_key, - size_t group_key_length, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/behavior.h b/libmemcached-1.2/behavior.h deleted file mode 100644 index 3ccefc0f..00000000 --- a/libmemcached-1.2/behavior.h +++ /dev/null @@ -1,83 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_behavior_set(memcached_st *ptr, const memcached_behavior_t flag, uint64_t data); - -LIBMEMCACHED_API -uint64_t memcached_behavior_get(memcached_st *ptr, const memcached_behavior_t flag); - -LIBMEMCACHED_API -memcached_return_t memcached_behavior_set_distribution(memcached_st *ptr, memcached_server_distribution_t type); - -LIBMEMCACHED_API -memcached_server_distribution_t memcached_behavior_get_distribution(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_return_t memcached_behavior_set_key_hash(memcached_st *ptr, memcached_hash_t type); - -LIBMEMCACHED_API -memcached_hash_t memcached_behavior_get_key_hash(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type); - -LIBMEMCACHED_API -memcached_hash_t memcached_behavior_get_distribution_hash(memcached_st *ptr); - -LIBMEMCACHED_API - const char *libmemcached_string_behavior(const memcached_behavior_t flag); - -LIBMEMCACHED_API - const char *libmemcached_string_distribution(const memcached_server_distribution_t flag); - -LIBMEMCACHED_API - memcached_return_t memcached_bucket_set(memcached_st *self, - const uint32_t *host_map, - const uint32_t *forward_map, - const uint32_t buckets, - const uint32_t replicas); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/callback.h b/libmemcached-1.2/callback.h deleted file mode 100644 index ddd39aeb..00000000 --- a/libmemcached-1.2/callback.h +++ /dev/null @@ -1,50 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_callback_set(memcached_st *ptr, - const memcached_callback_t flag, - const void *data); -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/configure.h.in b/libmemcached-1.2/configure.h.in deleted file mode 100644 index 167c4f23..00000000 --- a/libmemcached-1.2/configure.h.in +++ /dev/null @@ -1,52 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -@DEPRECATED@ -@LIBMEMCACHED_WITH_SASL_SUPPORT@ - -#define LIBMEMCACHED_VERSION_STRING "@VERSION@" -#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@ - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/delete.h b/libmemcached-1.2/delete.h deleted file mode 100644 index f01659cb..00000000 --- a/libmemcached-1.2/delete.h +++ /dev/null @@ -1,57 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t key_length, - time_t unused); - -LIBMEMCACHED_API -memcached_return_t memcached_delete_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - time_t unused); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/dump.h b/libmemcached-1.2/dump.h deleted file mode 100644 index 9cf3c2d7..00000000 --- a/libmemcached-1.2/dump.h +++ /dev/null @@ -1,50 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *function, void *context, uint32_t number_of_callbacks); - - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/error.h b/libmemcached-1.2/error.h deleted file mode 100644 index 6b2a581b..00000000 --- a/libmemcached-1.2/error.h +++ /dev/null @@ -1,58 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * LibMemcached - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API - const char *memcached_last_error_message(memcached_st *); - -LIBMEMCACHED_API - memcached_return_t memcached_last_error(memcached_st *); - -LIBMEMCACHED_API - const char *memcached_server_last_error_message(memcached_server_instance_st ptr); - -LIBMEMCACHED_API - memcached_return_t memcached_server_last_error(memcached_server_instance_st ptr); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/exist.h b/libmemcached-1.2/exist.h deleted file mode 100644 index 4147c3de..00000000 --- a/libmemcached-1.2/exist.h +++ /dev/null @@ -1,52 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -memcached_return_t memcached_exist(memcached_st *memc, const char *key, size_t key_length); - -memcached_return_t memcached_exist_by_key(memcached_st *memc, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/fetch.h b/libmemcached-1.2/fetch.h deleted file mode 100644 index 2c26d39d..00000000 --- a/libmemcached-1.2/fetch.h +++ /dev/null @@ -1,53 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_fetch_execute(memcached_st *ptr, - memcached_execute_fn *callback, - void *context, - uint32_t number_of_callbacks); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/flush.h b/libmemcached-1.2/flush.h deleted file mode 100644 index f38e3c03..00000000 --- a/libmemcached-1.2/flush.h +++ /dev/null @@ -1,49 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_flush(memcached_st *ptr, time_t expiration); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/flush_buffers.h b/libmemcached-1.2/flush_buffers.h deleted file mode 100644 index 42484b91..00000000 --- a/libmemcached-1.2/flush_buffers.h +++ /dev/null @@ -1,49 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_flush_buffers(memcached_st *mem); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/get.h b/libmemcached-1.2/get.h deleted file mode 100644 index bd49aeb6..00000000 --- a/libmemcached-1.2/get.h +++ /dev/null @@ -1,102 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - - -#ifdef __cplusplus -extern "C" { -#endif - -/* Public defines */ -LIBMEMCACHED_API -char *memcached_get(memcached_st *ptr, - const char *key, size_t key_length, - size_t *value_length, - uint32_t *flags, - memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t memcached_mget(memcached_st *ptr, - const char * const *keys, - const size_t *key_length, - size_t number_of_keys); - -LIBMEMCACHED_API -char *memcached_get_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - size_t *value_length, - uint32_t *flags, - memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t memcached_mget_by_key(memcached_st *ptr, - const char *group_key, - size_t group_key_length, - const char * const *keys, - const size_t *key_length, - const size_t number_of_keys); - -LIBMEMCACHED_API -memcached_result_st *memcached_fetch_result(memcached_st *ptr, - memcached_result_st *result, - memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t memcached_mget_execute(memcached_st *ptr, - const char * const *keys, - const size_t *key_length, - const size_t number_of_keys, - memcached_execute_fn *callback, - void *context, - const uint32_t number_of_callbacks); - -LIBMEMCACHED_API -memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr, - const char *group_key, - size_t group_key_length, - const char * const *keys, - const size_t *key_length, - size_t number_of_keys, - memcached_execute_fn *callback, - void *context, - const uint32_t number_of_callbacks); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/hash.h b/libmemcached-1.2/hash.h deleted file mode 100644 index a9b7d25f..00000000 --- a/libmemcached-1.2/hash.h +++ /dev/null @@ -1,52 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -const hashkit_st *memcached_get_hashkit(const memcached_st *ptr); - -LIBMEMCACHED_API -memcached_return_t memcached_set_hashkit(memcached_st *ptr, hashkit_st *hashk); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/include.am b/libmemcached-1.2/include.am deleted file mode 100644 index 061b79de..00000000 --- a/libmemcached-1.2/include.am +++ /dev/null @@ -1,45 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root -# - -include libmemcached-1.2/t/include.am - -BUILT_SOURCES+= libmemcached-1.2/configure.h -EXTRA_DIST+= libmemcached-1.2/configure.h.in - -nobase_include_HEADERS+= \ - libmemcached-1.2/allocators.h \ - libmemcached-1.2/auto.h \ - libmemcached-1.2/behavior.h \ - libmemcached-1.2/callback.h \ - libmemcached-1.2/configure.h \ - libmemcached-1.2/constants.h \ - libmemcached-1.2/delete.h \ - libmemcached-1.2/dump.h \ - libmemcached-1.2/error.h \ - libmemcached-1.2/exist.h \ - libmemcached-1.2/exception.hpp \ - libmemcached-1.2/fetch.h \ - libmemcached-1.2/flush.h \ - libmemcached-1.2/flush_buffers.h \ - libmemcached-1.2/get.h \ - libmemcached-1.2/hash.h \ - libmemcached-1.2/memcached.h \ - libmemcached-1.2/memcached.hpp \ - libmemcached-1.2/options.h \ - libmemcached-1.2/parse.h \ - libmemcached-1.2/quit.h \ - libmemcached-1.2/return.h \ - libmemcached-1.2/platform.h \ - libmemcached-1.2/result.h \ - libmemcached-1.2/sasl.h \ - libmemcached-1.2/server.h \ - libmemcached-1.2/stats.h \ - libmemcached-1.2/storage.h \ - libmemcached-1.2/strerror.h \ - libmemcached-1.2/touch.h \ - libmemcached-1.2/types.h \ - libmemcached-1.2/verbosity.h \ - libmemcached-1.2/version.h \ - libmemcached-1.2/visibility.h diff --git a/libmemcached-1.2/memcached.h b/libmemcached-1.2/memcached.h deleted file mode 100644 index eeb3a8b1..00000000 --- a/libmemcached-1.2/memcached.h +++ /dev/null @@ -1,133 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#include -#include -#include - - -#if !defined(__cplusplus) -# include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Everything above this line must be in the order specified. -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -void memcached_servers_reset(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_st *memcached_create(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_st *memcached(const char *string, size_t string_length); - -LIBMEMCACHED_API -void memcached_free(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_return_t memcached_reset(memcached_st *ptr); - -LIBMEMCACHED_API -void memcached_reset_last_disconnected_server(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr); - -LIBMEMCACHED_API -void *memcached_get_user_data(const memcached_st *ptr); - -LIBMEMCACHED_API -void *memcached_set_user_data(memcached_st *ptr, void *data); - -LIBMEMCACHED_API -memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source); - -LIBMEMCACHED_API -memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key); - -LIBMEMCACHED_API -uint32_t memcached_server_count(const memcached_st *); - -LIBMEMCACHED_API -uint64_t memcached_query_id(const memcached_st *); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/options.h b/libmemcached-1.2/options.h deleted file mode 100644 index f5a6e06d..00000000 --- a/libmemcached-1.2/options.h +++ /dev/null @@ -1,49 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API - memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/platform.h b/libmemcached-1.2/platform.h deleted file mode 100644 index 763febaa..00000000 --- a/libmemcached-1.2/platform.h +++ /dev/null @@ -1,56 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - - -#ifdef WIN32 - -#include -#include -typedef short in_port_t; -typedef SOCKET memcached_socket_t; -#else -typedef int memcached_socket_t; -#include -#include -#include -#include -#include -#include - -#endif /* WIN32 */ diff --git a/libmemcached-1.2/result.h b/libmemcached-1.2/result.h deleted file mode 100644 index 4f7da4d2..00000000 --- a/libmemcached-1.2/result.h +++ /dev/null @@ -1,67 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/* Result Struct */ -LIBMEMCACHED_API -void memcached_result_free(memcached_result_st *result); - -const char *memcached_result_key_value(const memcached_result_st *self); - -LIBMEMCACHED_API -size_t memcached_result_key_length(const memcached_result_st *self); - -LIBMEMCACHED_API -const char *memcached_result_value(const memcached_result_st *self); - -LIBMEMCACHED_API -size_t memcached_result_length(const memcached_result_st *self); - -LIBMEMCACHED_API -uint32_t memcached_result_flags(const memcached_result_st *self); - -LIBMEMCACHED_API -uint64_t memcached_result_cas(const memcached_result_st *self); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/return.h b/libmemcached-1.2/return.h deleted file mode 100644 index e5788c50..00000000 --- a/libmemcached-1.2/return.h +++ /dev/null @@ -1,130 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -enum memcached_return_t { - MEMCACHED_SUCCESS, - MEMCACHED_FAILURE, - MEMCACHED_HOST_LOOKUP_FAILURE, // getaddrinfo() and getnameinfo() only - MEMCACHED_CONNECTION_FAILURE, - MEMCACHED_CONNECTION_BIND_FAILURE, // DEPRECATED, see MEMCACHED_HOST_LOOKUP_FAILURE - MEMCACHED_WRITE_FAILURE, - MEMCACHED_READ_FAILURE, - MEMCACHED_UNKNOWN_READ_FAILURE, - MEMCACHED_PROTOCOL_ERROR, - MEMCACHED_CLIENT_ERROR, - MEMCACHED_SERVER_ERROR, - MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED - MEMCACHED_DATA_EXISTS, - MEMCACHED_DATA_DOES_NOT_EXIST, - MEMCACHED_NOTSTORED, - MEMCACHED_STORED, - MEMCACHED_NOTFOUND, - MEMCACHED_MEMORY_ALLOCATION_FAILURE, - MEMCACHED_PARTIAL_READ, - MEMCACHED_SOME_ERRORS, - MEMCACHED_NO_SERVERS, - MEMCACHED_END, - MEMCACHED_DELETED, - MEMCACHED_VALUE, - MEMCACHED_STAT, - MEMCACHED_ITEM, - MEMCACHED_ERRNO, - MEMCACHED_FAIL_UNIX_SOCKET, // DEPRECATED - MEMCACHED_NOT_SUPPORTED, - MEMCACHED_NO_KEY_PROVIDED, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED! */ - MEMCACHED_FETCH_NOTFINISHED, - MEMCACHED_TIMEOUT, - MEMCACHED_BUFFERED, - MEMCACHED_BAD_KEY_PROVIDED, - MEMCACHED_INVALID_HOST_PROTOCOL, - MEMCACHED_SERVER_MARKED_DEAD, - MEMCACHED_UNKNOWN_STAT_KEY, - MEMCACHED_E2BIG, - MEMCACHED_INVALID_ARGUMENTS, - MEMCACHED_KEY_TOO_BIG, - MEMCACHED_AUTH_PROBLEM, - MEMCACHED_AUTH_FAILURE, - MEMCACHED_AUTH_CONTINUE, - MEMCACHED_PARSE_ERROR, - MEMCACHED_PARSE_USER_ERROR, - MEMCACHED_DEPRECATED, - MEMCACHED_IN_PROGRESS, - MEMCACHED_SERVER_TEMPORARILY_DISABLED, - MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE, - MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */ -}; - -#ifndef __cplusplus -typedef enum memcached_return_t memcached_return_t; -#endif - -static inline bool memcached_success(memcached_return_t rc) -{ - return (rc == MEMCACHED_BUFFERED || - rc == MEMCACHED_DELETED || - rc == MEMCACHED_END || - rc == MEMCACHED_ITEM || - rc == MEMCACHED_STAT || - rc == MEMCACHED_STORED || - rc == MEMCACHED_SUCCESS || - rc == MEMCACHED_VALUE); -} - -static inline bool memcached_failed(memcached_return_t rc) -{ - return (rc != MEMCACHED_SUCCESS && - rc != MEMCACHED_END && - rc != MEMCACHED_STORED && - rc != MEMCACHED_STAT && - rc != MEMCACHED_DELETED && - rc != MEMCACHED_BUFFERED && - rc != MEMCACHED_VALUE); -} - -static inline bool memcached_fatal(memcached_return_t rc) -{ - return (rc != MEMCACHED_SUCCESS && - rc != MEMCACHED_END && - rc != MEMCACHED_STORED && - rc != MEMCACHED_STAT && - rc != MEMCACHED_DELETED && - rc != MEMCACHED_BUFFERED && - rc != MEMCACHED_VALUE); -} - -#define memcached_continue(__memcached_return_t) ((__memcached_return_t) == MEMCACHED_IN_PROGRESS) diff --git a/libmemcached-1.2/sasl.h b/libmemcached-1.2/sasl.h deleted file mode 100644 index 6cbaec3f..00000000 --- a/libmemcached-1.2/sasl.h +++ /dev/null @@ -1,77 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT -#include -#else -#define sasl_callback_t void -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -void memcached_set_sasl_callbacks(memcached_st *ptr, - const sasl_callback_t *callbacks); - -LIBMEMCACHED_API -memcached_return_t memcached_set_sasl_auth_data(memcached_st *ptr, - const char *username, - const char *password); - -LIBMEMCACHED_API -memcached_return_t memcached_destroy_sasl_auth_data(memcached_st *ptr); - - -LIBMEMCACHED_API -sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr); - -#ifdef __cplusplus -} -#endif - -struct memcached_sasl_st { - sasl_callback_t *callbacks; - /* - ** Did we allocate data inside the callbacks, or did the user - ** supply that. - */ - bool is_allocated; -}; diff --git a/libmemcached-1.2/server.h b/libmemcached-1.2/server.h deleted file mode 100644 index 7359effd..00000000 --- a/libmemcached-1.2/server.h +++ /dev/null @@ -1,87 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_server_cursor(const memcached_st *ptr, - const memcached_server_fn *callback, - void *context, - uint32_t number_of_callbacks); - -LIBMEMCACHED_API - memcached_server_instance_st memcached_server_by_key(memcached_st *ptr, - const char *key, - size_t key_length, - memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, - const char *filename); -LIBMEMCACHED_API -memcached_return_t memcached_server_add(memcached_st *ptr, - const char *hostname, in_port_t port); - -LIBMEMCACHED_API -memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *ptr, - const char *filename, - uint32_t weight); -LIBMEMCACHED_API -memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, - in_port_t port, - uint32_t weight); - -/** - Operations on Single Servers. -*/ -LIBMEMCACHED_API -const char *memcached_server_name(const memcached_server_instance_st self); - -LIBMEMCACHED_API -in_port_t memcached_server_port(const memcached_server_instance_st self); - -LIBMEMCACHED_API -const char *memcached_server_type(const memcached_server_instance_st ptr); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/stats.h b/libmemcached-1.2/stats.h deleted file mode 100644 index ebba16f8..00000000 --- a/libmemcached-1.2/stats.h +++ /dev/null @@ -1,49 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_stat_execute(memcached_st *memc, const char *args, memcached_stat_fn func, void *context); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcached-1.2/storage.h b/libmemcached-1.2/storage.h deleted file mode 100644 index 5c0c2cba..00000000 --- a/libmemcached-1.2/storage.h +++ /dev/null @@ -1,131 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/* All of the functions for adding data to the server */ -LIBMEMCACHED_API -memcached_return_t memcached_set(memcached_st *ptr, const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); -LIBMEMCACHED_API -memcached_return_t memcached_add(memcached_st *ptr, const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); -LIBMEMCACHED_API -memcached_return_t memcached_replace(memcached_st *ptr, const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); -LIBMEMCACHED_API -memcached_return_t memcached_append(memcached_st *ptr, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); -LIBMEMCACHED_API -memcached_return_t memcached_prepend(memcached_st *ptr, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); -LIBMEMCACHED_API -memcached_return_t memcached_cas(memcached_st *ptr, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags, - uint64_t cas); - -LIBMEMCACHED_API -memcached_return_t memcached_set_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -LIBMEMCACHED_API -memcached_return_t memcached_add_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -LIBMEMCACHED_API -memcached_return_t memcached_replace_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -LIBMEMCACHED_API -memcached_return_t memcached_prepend_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -LIBMEMCACHED_API -memcached_return_t memcached_append_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -LIBMEMCACHED_API -memcached_return_t memcached_cas_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - const char *value, size_t value_length, - time_t expiration, - uint32_t flags, - uint64_t cas); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/strerror.h b/libmemcached-1.2/strerror.h deleted file mode 100644 index b6ec12d3..00000000 --- a/libmemcached-1.2/strerror.h +++ /dev/null @@ -1,50 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -const char *memcached_strerror(memcached_st *not_used, memcached_return_t rc); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/t/c_test.c b/libmemcached-1.2/t/c_test.c deleted file mode 100644 index e8960f4c..00000000 --- a/libmemcached-1.2/t/c_test.c +++ /dev/null @@ -1,56 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached C test app - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -/* - * @file @brief C dummy test, aka testing C linking, etc - */ - -#include - -#include - -int main(void) -{ - (void)memcached_success(MEMCACHED_SUCCESS); - (void)memcached_failed(MEMCACHED_SUCCESS); - (void)memcached_continue(MEMCACHED_SUCCESS); - - memcached_st *memc= memcached_create(NULL); - memcached_free(memc); - - return EXIT_SUCCESS; -} - diff --git a/libmemcached-1.2/t/cc_test.cc b/libmemcached-1.2/t/cc_test.cc deleted file mode 100644 index e8960f4c..00000000 --- a/libmemcached-1.2/t/cc_test.cc +++ /dev/null @@ -1,56 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached C test app - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -/* - * @file @brief C dummy test, aka testing C linking, etc - */ - -#include - -#include - -int main(void) -{ - (void)memcached_success(MEMCACHED_SUCCESS); - (void)memcached_failed(MEMCACHED_SUCCESS); - (void)memcached_continue(MEMCACHED_SUCCESS); - - memcached_st *memc= memcached_create(NULL); - memcached_free(memc); - - return EXIT_SUCCESS; -} - diff --git a/libmemcached-1.2/t/include.am b/libmemcached-1.2/t/include.am deleted file mode 100644 index 6c11f2de..00000000 --- a/libmemcached-1.2/t/include.am +++ /dev/null @@ -1,8 +0,0 @@ -# vim:ft=automake - -# Test linking with C application -libmemcached_1_2_c_test_SOURCES= libmemcached-1.2/t/c_test.c -libmemcached_1_2_c_test_LDADD= libmemcached/libmemcached.la -libmemcached_1_2_c_test_DEPENDENCIES= libmemcached/libmemcached.la -check_PROGRAMS+= libmemcached-1.2/t/c_test -noinst_PROGRAMS+= libmemcached-1.2/t/c_test diff --git a/libmemcached-1.2/touch.h b/libmemcached-1.2/touch.h deleted file mode 100644 index 631d3fdb..00000000 --- a/libmemcached-1.2/touch.h +++ /dev/null @@ -1,59 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - - -LIBMEMCACHED_API -memcached_return_t memcached_touch(memcached_st *ptr, - const char *key, size_t key_length, - time_t expiration); - -LIBMEMCACHED_API -memcached_return_t memcached_touch_by_key(memcached_st *ptr, - const char *group_key, size_t group_key_length, - const char *key, size_t key_length, - time_t expiration); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/types.h b/libmemcached-1.2/types.h deleted file mode 100644 index a342e9e5..00000000 --- a/libmemcached-1.2/types.h +++ /dev/null @@ -1,78 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -#ifdef __cplusplus -struct memcached_st; -struct memcached_result_st; -struct memcached_array_st; -struct memcached_error_t; - -// All of the flavors of memcache_server_st -struct memcached_server_st; -typedef const struct memcached_server_st *memcached_server_instance_st; -typedef struct memcached_server_st *memcached_server_list_st; - -struct memcached_callback_st; - -// The following two structures are internal, and never exposed to users. -struct memcached_string_st; -struct memcached_string_t; -struct memcached_continuum_item_st; - -#else - -typedef struct memcached_st memcached_st; -typedef struct memcached_result_st memcached_result_st; -typedef struct memcached_array_st memcached_array_st; -typedef struct memcached_error_t memcached_error_t; - -// All of the flavors of memcache_server_st -typedef struct memcached_server_st memcached_server_st; -typedef const struct memcached_server_st *memcached_server_instance_st; -typedef struct memcached_server_st *memcached_server_list_st; - -typedef struct memcached_callback_st memcached_callback_st; - -// The following two structures are internal, and never exposed to users. -typedef struct memcached_string_st memcached_string_st; -typedef struct memcached_string_t memcached_string_t; -typedef struct memcached_continuum_item_st memcached_continuum_item_st; - -#endif diff --git a/libmemcached-1.2/verbosity.h b/libmemcached-1.2/verbosity.h deleted file mode 100644 index 3882592e..00000000 --- a/libmemcached-1.2/verbosity.h +++ /dev/null @@ -1,50 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_verbosity(memcached_st *ptr, uint32_t verbosity); - - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/version.h b/libmemcached-1.2/version.h deleted file mode 100644 index bfda1632..00000000 --- a/libmemcached-1.2/version.h +++ /dev/null @@ -1,52 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.comAker - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_return_t memcached_version(memcached_st *ptr); - -LIBMEMCACHED_API -const char * memcached_lib_version(void); - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-1.2/visibility.h b/libmemcached-1.2/visibility.h deleted file mode 100644 index 168281b5..00000000 --- a/libmemcached-1.2/visibility.h +++ /dev/null @@ -1,87 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#pragma once - -/** - * - * LIBMEMCACHED_API is used for the public API symbols. It either DLL imports or - * DLL exports (or does nothing for static build). - * - * LIBMEMCACHED_LOCAL is used for non-api symbols. - */ - -#if defined(BUILDING_LIBMEMCACHEDINTERNAL) -# if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY -# define LIBMEMCACHED_API __attribute__ ((visibility("default"))) -# define LIBMEMCACHED_LOCAL __attribute__ ((visibility("default"))) -# elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550) -# define LIBMEMCACHED_API __global -# define LIBMEMCACHED_LOCAL __global -# elif defined(_MSC_VER) -# define LIBMEMCACHED_API extern __declspec(dllexport) -# define LIBMEMCACHED_LOCAL extern __declspec(dllexport) -# else -# define LIBMEMCACHED_API -# define LIBMEMCACHED_LOCAL -# endif -#else -# if defined(BUILDING_LIBMEMCACHED) -# if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY -# define LIBMEMCACHED_API __attribute__ ((visibility("default"))) -# define LIBMEMCACHED_LOCAL __attribute__ ((visibility("hidden"))) -# elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550) -# define LIBMEMCACHED_API __global -# define LIBMEMCACHED_LOCAL __hidden -# elif defined(_MSC_VER) -# define LIBMEMCACHED_API extern __declspec(dllexport) -# define LIBMEMCACHED_LOCAL -# else -# define LIBMEMCACHED_API -# define LIBMEMCACHED_LOCAL -# endif /* defined(HAVE_VISIBILITY) */ -# else /* defined(BUILDING_LIBMEMCACHED) */ -# if defined(_MSC_VER) -# define LIBMEMCACHED_API extern __declspec(dllimport) -# define LIBMEMCACHED_LOCAL -# else -# define LIBMEMCACHED_API -# define LIBMEMCACHED_LOCAL -# endif /* defined(_MSC_VER) */ -# endif /* defined(BUILDING_LIBMEMCACHED) */ -#endif /* defined(BUILDING_LIBMEMCACHEDINTERNAL) */ diff --git a/libmemcached-2.0/configure.h.in b/libmemcached-2.0/configure.h.in deleted file mode 100644 index 56ec61f2..00000000 --- a/libmemcached-2.0/configure.h.in +++ /dev/null @@ -1,51 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -@LIBMEMCACHED_WITH_SASL_SUPPORT@ - -#define LIBMEMCACHED_VERSION_STRING "@VERSION@" -#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@ - -#ifdef __cplusplus -} -#endif diff --git a/libmemcached-2.0/error.h b/libmemcached-2.0/error.h deleted file mode 100644 index 52cc759f..00000000 --- a/libmemcached-2.0/error.h +++ /dev/null @@ -1,59 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * LibMemcached - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API - const char *memcached_last_error_message(memcached_st *); - -LIBMEMCACHED_API - memcached_return_t memcached_last_error(memcached_st *); - -LIBMEMCACHED_API - const char *memcached_server_last_error_message(memcached_instance_st *); - -LIBMEMCACHED_API - memcached_return_t memcached_server_last_error(memcached_instance_st *); - -#ifdef __cplusplus -} // extern "C" -#endif - diff --git a/libmemcached-2.0/include.am b/libmemcached-2.0/include.am deleted file mode 100644 index 8d7a0661..00000000 --- a/libmemcached-2.0/include.am +++ /dev/null @@ -1,12 +0,0 @@ -# vim:ft=automake -# included from Top Level Makefile.am -# All paths should be given relative to the root - -# This is not a public interface yet. - -BUILT_SOURCES+= libmemcached-2.0/configure.h - -EXTRA_DIST+= libmemcached-1.2/configure.h.in - -noinst_HEADERS+= libmemcached-1.2/memcached.h - diff --git a/libmemcached-2.0/memcached.h b/libmemcached-2.0/memcached.h deleted file mode 100644 index ef2adf24..00000000 --- a/libmemcached-2.0/memcached.h +++ /dev/null @@ -1,72 +0,0 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * * The names of its contributors may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#pragma once - -#include -#include -#include - - -#if !defined(__cplusplus) -# include -#endif - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -LIBMEMCACHED_API -memcached_st *memcached(const char *string, size_t string_length); - -LIBMEMCACHED_API -void memcached_free(memcached_st *ptr); - -LIBMEMCACHED_API -memcached_st *memcached_clone(memcached_st *destination, const memcached_st *source); - -LIBMEMCACHED_API -void *memcached_get_user_data(const memcached_st *ptr); - -LIBMEMCACHED_API -void *memcached_set_user_data(memcached_st *ptr, void *data); - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/libmemcachedprotocol/include.am b/libmemcachedprotocol/include.am index 58aed623..33d00fe9 100644 --- a/libmemcachedprotocol/include.am +++ b/libmemcachedprotocol/include.am @@ -5,29 +5,28 @@ lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la -noinst_HEADERS+= \ - libmemcachedprotocol/ascii_handler.h \ - libmemcachedprotocol/binary_handler.h \ - libmemcachedprotocol/cache.h \ - libmemcachedprotocol/common.h +noinst_HEADERS+= libmemcachedprotocol/ascii_handler.h +noinst_HEADERS+= libmemcachedprotocol/binary_handler.h +noinst_HEADERS+= libmemcachedprotocol/cache.h +noinst_HEADERS+= libmemcachedprotocol/common.h -libmemcached_libmemcachedprotocol_la_SOURCES= \ - libmemcached/byteorder.cc \ - libmemcachedprotocol/ascii_handler.c \ - libmemcachedprotocol/binary_handler.c \ - libmemcachedprotocol/cache.c \ - libmemcachedprotocol/handler.c \ - libmemcachedprotocol/pedantic.c +libmemcached_libmemcachedprotocol_la_SOURCES= +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcached/byteorder.cc +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/ascii_handler.c +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/binary_handler.c +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/cache.c +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/handler.c +libmemcached_libmemcachedprotocol_la_SOURCES+= libmemcachedprotocol/pedantic.c -libmemcached_libmemcachedprotocol_la_CFLAGS= \ - ${AM_CFLAGS} \ - ${NO_CONVERSION} \ - -DBUILDING_LIBMEMCACHED +libmemcached_libmemcachedprotocol_la_CFLAGS= +libmemcached_libmemcachedprotocol_la_CFLAGS+= ${AM_CFLAGS} +libmemcached_libmemcachedprotocol_la_CFLAGS+= ${NO_CONVERSION} +libmemcached_libmemcachedprotocol_la_CFLAGS+= -DBUILDING_LIBMEMCACHED libmemcached_libmemcachedprotocol_la_CFLAGS+= ${PTHREAD_CFLAGS} -libmemcached_libmemcachedprotocol_la_CXXFLAGS= \ - ${AM_CXXFLAGS} \ - -DBUILDING_LIBMEMCACHED +libmemcached_libmemcachedprotocol_la_CXXFLAGS= +libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${AM_CXXFLAGS} +libmemcached_libmemcachedprotocol_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${PTHREAD_CFLAGS} libmemcached_libmemcachedprotocol_la_LIBADD= ${PTHREAD_LIBS} diff --git a/m4/ax_hex_version.m4 b/m4/ax_hex_version.m4 index 6130ccc1..bf1bcc1c 100644 --- a/m4/ax_hex_version.m4 +++ b/m4/ax_hex_version.m4 @@ -4,11 +4,11 @@ # # SYNOPSIS # -# AX_HEX_VERSION +# AX_HEX_VERSION(VARIABLE_NAME, VERSION) # # DESCRIPTION # -# Generate version information in HEX format. +# Generate version information in HEX and STRING format. # # LICENSE # @@ -19,13 +19,14 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 1 +#serial 2 AC_DEFUN([AX_HEX_VERSION],[ - AC_CACHE_CHECK([generate HEX_VERSION], [ax_cv_hex_version],[ - ax_cv_hex_version=`echo $VERSION | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'` - ]) - AC_SUBST([HEX_VERSION],["$ax_cv_hex_version"]) - AC_DEFINE([HEX_VERSION],[1],[HEX representation of VERSION]) + + string_version_$1=`echo $2 | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'` + hex_version_$1=`echo $2 | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'` + + AC_SUBST([$1_VERSION_STRING],["$string_version_$1"]) + AC_SUBST([$1_VERSION_HEX],["$hex_version_$1"]) ]) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 new file mode 100644 index 00000000..c1403b8c --- /dev/null +++ b/m4/ax_platform.m4 @@ -0,0 +1,66 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_count_cpus.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PLATFORM +# +# DESCRIPTION +# +# Provide target and host defines. +# +# LICENSE +# +# Copyright (c) 2012 Brian Aker +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + AC_DEFUN([AX_PLATFORM],[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_CANONICAL_TARGET]) + + AC_DEFINE_UNQUOTED([HOST_VENDOR], ["$host_vendor"],[Vendor of Build System]) + AC_DEFINE_UNQUOTED([HOST_OS], ["$host_os"], [OS of Build System]) + AC_DEFINE_UNQUOTED([HOST_CPU], ["$host_cpu"], [CPU of Build System]) + + AC_DEFINE_UNQUOTED([TARGET_VENDOR], ["$target_vendor"],[Vendor of Target System]) + AC_DEFINE_UNQUOTED([TARGET_OS], ["$target_os"], [OS of Target System]) + AC_DEFINE_UNQUOTED([TARGET_CPU], ["$target_cpu"], [CPU of Target System]) + + AS_CASE([$target_os],[ + *mingw32*],[ + AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) + AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) + AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) + AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) + AH_BOTTOM([ +#ifndef HAVE_SYS_SOCKET_H +# define SHUT_RD SD_RECEIVE +# define SHUT_WR SD_SEND +# define SHUT_RDWR SD_BOTH +#endif + ]) + ],[ + *freebsd*],[ + AC_DEFINE([TARGET_OS_FREEBSD], [1], [Whether we are building for FreeBSD]) + AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers]) + ],[ + *solaris*],[ + AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris]) + ],[ + *darwin*],[ + AC_DEFINE([TARGET_OS_OSX], [1], [Whether we build for OSX]) + ],[ + *linux*],[ + AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux]) + ]) + + AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL(TARGET_OSX, [test "x${TARGET_OSX}" = "xtrue"]) + AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"]) + ]) diff --git a/m4/bottom.m4 b/m4/bottom.m4 index 135cb976..a612d707 100644 --- a/m4/bottom.m4 +++ b/m4/bottom.m4 @@ -27,10 +27,6 @@ AH_BOTTOM([ typedef unsigned long int ulong; #endif -#define RPACKAGE "memcached" - -#define RVERSION "1.4.13" - ]) ])dnl CONFIG_EXTRA diff --git a/m4/pandora_64bit.m4 b/m4/pandora_64bit.m4 deleted file mode 100644 index 5d9983b8..00000000 --- a/m4/pandora_64bit.m4 +++ /dev/null @@ -1,60 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl --------------------------------------------------------------------------- -dnl Macro: PANDORA_64BIT -dnl --------------------------------------------------------------------------- -AC_DEFUN([PANDORA_64BIT],[ - AC_BEFORE([$0], [AC_LIB_PREFIX]) - - AC_ARG_ENABLE([64bit], - [AS_HELP_STRING([--disable-64bit], - [Build 64 bit binary @<:@default=on@:>@])], - [ac_enable_64bit="$enableval"], - [ac_enable_64bit="yes"]) - - AC_CHECK_PROGS(ISAINFO, [isainfo], [no]) - AS_IF([test "x$ISAINFO" != "xno"], - [isainfo_b=`${ISAINFO} -b`], - [isainfo_b="x"]) - - AS_IF([test "$isainfo_b" != "x" -a "$isainfo_b" != "32"],[ - - isainfo_k=`${ISAINFO} -k` - DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}" - - AS_IF([test "x$ac_enable_64bit" = "xyes"],[ - - AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[ - LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}" - ]) - - AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[ - dnl The user hasn't overridden the default libdir, so we'll - dnl the dir suffix to match solaris 32/64-bit policy - libdir="${libdir}/${isainfo_k}" - ]) - - AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],[ - CFLAGS="${CFLAGS} -m64" - ac_cv_env_CFLAGS_set=set - ac_cv_env_CFLAGS_value='-m64' - ]) - AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[ - CXXFLAGS="${CXXFLAGS} -m64" - ac_cv_env_CXXFLAGS_set=set - ac_cv_env_CXXFLAGS_value='-m64' - ]) - - AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes"],[ - AM_CFLAGS="-xmemalign=8s ${AM_CFLAGS}" - AM_CXXFLAGS="-xmemalign=8s ${AM_CXXFLAGS}" - ]) - ]) - ]) -]) -dnl --------------------------------------------------------------------------- -dnl End Macro: PANDORA_64BIT -dnl --------------------------------------------------------------------------- diff --git a/m4/pandora_check_compiler_version.m4 b/m4/pandora_check_compiler_version.m4 deleted file mode 100644 index f490ef27..00000000 --- a/m4/pandora_check_compiler_version.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - - -AC_DEFUN([PANDORA_CHECK_C_VERSION],[ - - dnl Print version of C compiler - AC_MSG_CHECKING("C Compiler version--$GCC") - AS_IF([test "$GCC" = "yes"],[ - CC_VERSION=`$CC --version | sed 1q` ],[ - test "$SUNCC" = "yes"],[ - CC_VERSION=`$CC -V 2>&1 | sed 1q` ],[ - test "$CLANG" = "yes"],[ - CC_VERSION=`$CC --version 2>&1 | sed 1q` ],[ - CC_VERSION="" - ]) - AC_MSG_RESULT("$CC_VERSION") - AC_SUBST(CC_VERSION) - ]) - - -AC_DEFUN([PANDORA_CHECK_CXX_VERSION], [ - - dnl Check C version while at it - AC_REQUIRE([PANDORA_CHECK_C_VERSION]) - - dnl Print version of CXX compiler - AC_MSG_CHECKING("C++ Compiler version") - AS_IF([test "$GCC" = "yes"],[ - CXX_VERSION=`$CXX --version | sed 1q` ],[ - test "$SUNCC" = "yes"],[ - CXX_VERSION=`$CXX -V 2>&1 | sed 1q` ],[ - test "$CLANG" = "yes"],[ - CXX_VERSION=`$CXX --version 2>&1 | sed 1q` ],[ - CXX_VERSION="" - ]) - AC_MSG_RESULT("$CXX_VERSION") -AC_SUBST(CXX_VERSION) - ]) diff --git a/m4/pandora_clock_gettime.m4 b/m4/pandora_clock_gettime.m4 deleted file mode 100644 index bab2f0bb..00000000 --- a/m4/pandora_clock_gettime.m4 +++ /dev/null @@ -1,15 +0,0 @@ -dnl Copyright (C) 2010 Monty Taylor -dnl This file is free software; Monty Taylor -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check for clock_gettime -#-------------------------------------------------------------------- - -AC_DEFUN([PANDORA_CLOCK_GETTIME],[ - AC_SEARCH_LIBS([clock_gettime],[rt]) - AS_IF([test "x${ac_cv_search_clock_gettime}" != "xno"],[ - AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have a working clock_gettime function]) - ]) -]) diff --git a/m4/pandora_ensure_gcc_version.m4 b/m4/pandora_ensure_gcc_version.m4 deleted file mode 100644 index 9d2f65d3..00000000 --- a/m4/pandora_ensure_gcc_version.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([_PANDORA_TRY_GCC],[ - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CHECK_PROGS([CC]NAME,[gcc$1]) - AC_CHECK_PROGS([CXX]NAME,[g++$1]) - AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CC_set}" = "x"], - [CC="${CC]NAME[}"]) - AS_IF([test "x${CXX]NAME[}" != "x" -a "x${ac_cv_env_CCX_set}" = "x"], - [CXX="${CXX]NAME[}"]) - AS_IF([test "x${CC]NAME[}" != "x" -a "x${ac_cv_env_CPP_set}" = "x"], - [CPP="${CC]NAME[} -E"]) -]) - -dnl If the user is on a Mac and didn't ask for a specific compiler -dnl You're gonna get 4.2. -AC_DEFUN([PANDORA_MAC_GCC42], - [AS_IF([test "$GCC" = "yes"],[ - AS_IF([test "$host_vendor" = "apple" -a "x${ac_cv_env_CC_set}" = "x"],[ - host_os_version=`echo ${host_os} | perl -ple 's/^\D+//g;s,\..*,,'` - AS_IF([test "$host_os_version" -lt 10],[ - _PANDORA_TRY_GCC([-4.2]) - ]) - ]) - ]) -]) - -dnl If the user is on CentOS or RHEL and didn't ask for a specific compiler -dnl You're gonna get 4.4 (forward compatible with 4.5) -AC_DEFUN([PANDORA_RH_GCC44], - [AS_IF([test "$GCC" = "yes"],[ - AS_IF([test "x${ac_cv_env_CC_set}" = "x"],[ - _PANDORA_TRY_GCC([44]) - _PANDORA_TRY_GCC([45]) - ]) - ]) -]) - -dnl -AC_DEFUN([PANDORA_ENSURE_GCC_VERSION],[ - AC_REQUIRE([PANDORA_MAC_GCC42]) - AC_REQUIRE([PANDORA_RH_GCC44]) - AS_IF([test "$GCC" = "yes"],[ - AC_CACHE_CHECK([if GCC is recent enough], [ac_cv_gcc_recent], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#if !defined(__GNUC__) || (__GNUC__ < 4) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ < 2)) -# error GCC is Too Old! -#endif - ]])], - [ac_cv_gcc_recent=yes], - [ac_cv_gcc_recent=no])]) - AS_IF([test "$ac_cv_gcc_recent" = "no" -a "$host_vendor" = "apple"], - AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required on OSX. You may need to install a version of XCode >= 3.1.2])) - AS_IF([test "$ac_cv_gcc_recent" = "no"], - AC_MSG_ERROR([Your version of GCC is too old. At least version 4.2 is required. On RHEL/CentOS systems this is found in the gcc44 and gcc44-c++ packages.])) - ]) -]) diff --git a/m4/pandora_extensions.m4 b/m4/pandora_extensions.m4 deleted file mode 100644 index b2720eff..00000000 --- a/m4/pandora_extensions.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([PANDORA_EXTENSIONS],[ - - m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], - [AC_REQUIRE([AC_GNU_SOURCE])]) - -]) - -AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],[ - AC_REQUIRE([PANDORA_EXTENSIONS]) -]) diff --git a/m4/pandora_fdatasync.m4 b/m4/pandora_fdatasync.m4 deleted file mode 100644 index e8bba25c..00000000 --- a/m4/pandora_fdatasync.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check for a working fdatasync call -#-------------------------------------------------------------------- - - -AC_DEFUN([PANDORA_WORKING_FDATASYNC],[ - AC_CACHE_CHECK([working fdatasync],[ac_cv_func_fdatasync],[ - AC_LANG_PUSH(C++) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include - ]],[[ -fdatasync(4); - ]])], - [ac_cv_func_fdatasync=yes], - [ac_cv_func_fdatasync=no]) - AC_LANG_POP() - ]) - AS_IF([test "x${ac_cv_func_fdatasync}" = "xyes"], - [AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])]) -]) diff --git a/m4/pandora_have_better_malloc.m4 b/m4/pandora_have_better_malloc.m4 deleted file mode 100644 index c984cbaf..00000000 --- a/m4/pandora_have_better_malloc.m4 +++ /dev/null @@ -1,66 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - AC_ARG_ENABLE([umem], - [AS_HELP_STRING([--enable-umem], - [Enable linking with libumem @<:@default=off@:>@])], - [ac_enable_umem="$enableval"],[ - case "$target_os" in - *solaris*) - ac_enable_umem="yes" - ;; - *) - ac_enable_umem="no" - ;; - esac - ]) - - AC_ARG_ENABLE([tcmalloc], - [AS_HELP_STRING([--enable-tcmalloc], - [Enable linking with tcmalloc @<:@default=off@:>@])], - [ac_enable_tcmalloc="$enableval"], - [ac_enable_tcmalloc="no"]) - - AC_ARG_ENABLE([mtmalloc], - [AS_HELP_STRING([--disable-mtmalloc], - [Enable linking with mtmalloc @<:@default=on@:>@])], - [ac_enable_mtmalloc="$enableval"], - [ac_enable_mtmalloc="yes"]) - - save_LIBS="${LIBS}" - LIBS= - AS_IF([test "x$ac_enable_umem" = "xyes"],[ - AC_CHECK_LIB(umem,malloc,[],[]) - ],[ - case "$target_os" in - *linux*) - AS_IF([test "x$ac_enable_tcmalloc" != "xno"],[ - AC_CHECK_LIB(tcmalloc-minimal,malloc,[],[]) - AS_IF([test "x$ac_cv_lib_tcmalloc_minimal_malloc" != "xyes"],[ - AC_CHECK_LIB(tcmalloc,malloc,[],[]) - ]) - ]) - ;; - *solaris*) - AS_IF([test "x$ac_enable_mtmalloc" != "xno"],[ - AC_CHECK_LIB(mtmalloc,malloc,[],[]) - ]) - ;; - esac - ]) - BETTER_MALLOC_LIBS="${LIBS}" - LIBS="${save_LIBS}" - AC_SUBST([BETTER_MALLOC_LIBS]) - -]) - -AC_DEFUN([PANDORA_USE_BETTER_MALLOC],[ - AC_REQUIRE([PANDORA_HAVE_BETTER_MALLOC]) - LIBS="${LIBS} ${BETTER_MALLOC_LIBS}" -]) - diff --git a/m4/pandora_have_gcc_atomics.m4 b/m4/pandora_have_gcc_atomics.m4 deleted file mode 100644 index a106895f..00000000 --- a/m4/pandora_have_gcc_atomics.m4 +++ /dev/null @@ -1,37 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check for GCC Atomic Support -#-------------------------------------------------------------------- - - -AC_DEFUN([PANDORA_HAVE_GCC_ATOMICS],[ - - AC_CACHE_CHECK( - [whether the compiler provides atomic builtins], - [ac_cv_gcc_atomic_builtins], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM([],[[ - int foo= -10; int bar= 10; - if (!__sync_fetch_and_add(&foo, bar) || foo) - return -1; - bar= __sync_lock_test_and_set(&foo, bar); - if (bar || foo != 10) - return -1; - bar= __sync_val_compare_and_swap(&bar, foo, 15); - if (bar) - return -1; - return 0; - ]])], - [ac_cv_gcc_atomic_builtins=yes], - [ac_cv_gcc_atomic_builtins=no])]) - - AS_IF([test "x$ac_cv_gcc_atomic_builtins" = "xyes"],[ - AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, - [Define to 1 if compiler provides atomic builtins.]) - ]) - -]) diff --git a/m4/pandora_have_libaio.m4 b/m4/pandora_have_libaio.m4 deleted file mode 100644 index 000073b2..00000000 --- a/m4/pandora_have_libaio.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl Copyright (C) 2011 Andrew Hutchings -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check for libaio -#-------------------------------------------------------------------- - - -AC_DEFUN([_PANDORA_SEARCH_LIBAIO],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - AC_CHECK_HEADERS(libaio.h) - AC_LIB_HAVE_LINKFLAGS(aio,, - [ - #include - ], - [ - int aio_cmd= IO_CMD_PREAD; - ]) - - AM_CONDITIONAL(HAVE_LIBAIO, [test "x${ac_cv_libaio}" = "xyes"]) - - AS_IF([test "x${ac_cv_libaio}" = "xyes"],[ - AC_DEFINE([LINUX_NATIVE_AIO], [1], [Enabel libaio support in InnoDB]) - ]) -]) - -AC_DEFUN([_PANDORA_HAVE_LIBAIO],[ - - AC_ARG_ENABLE([libaio], - [AS_HELP_STRING([--disable-libaio], - [Build with libaio support @<:@default=on@:>@])], - [ac_enable_libaio="$enableval"], - [ac_enable_libaio="yes"]) - - _PANDORA_SEARCH_LIBAIO -]) - - -AC_DEFUN([PANDORA_HAVE_LIBAIO],[ - AC_REQUIRE([_PANDORA_HAVE_LIBAIO]) -]) - -AC_DEFUN([_PANDORA_REQUIRE_LIBAIO],[ - ac_enable_libaio="yes" - _PANDORA_SEARCH_LIBAIO - AS_IF([test "x$ac_cv_header_libaio_h" = "xno"],[ - AC_MSG_ERROR([Couldn't find libaio.h. On Debian this can be found in libaio-dev. On Redhat this can be found in libaio-devel.]) - ]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBAIO],[ - AC_REQUIRE([_PANDORA_REQUIRE_LIBAIO]) -]) diff --git a/m4/pandora_have_libavahi.m4 b/m4/pandora_have_libavahi.m4 deleted file mode 100644 index b32432dc..00000000 --- a/m4/pandora_have_libavahi.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([_PANDORA_SEARCH_LIBAVAHI],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - dnl -------------------------------------------------------------------- - dnl Check for libavahi - dnl -------------------------------------------------------------------- - - AC_ARG_ENABLE([libavahi], - [AS_HELP_STRING([--disable-libavahi], - [Build with libavahi support @<:@default=on@:>@])], - [ac_enable_libavahi="$enableval"], - [ac_enable_libavahi="yes"]) - - AS_IF([test "x$ac_enable_libavahi" = "xyes"],[ - AC_LIB_HAVE_LINKFLAGS(avahi-client,avahi-common,[ - #include - #include - ],[ - AvahiSimplePoll *simple_poll= avahi_simple_poll_new(); - ]) - ],[ - ac_cv_libavahi="no" - ]) - - AM_CONDITIONAL(HAVE_LIBAVAHI, [test "x${ac_cv_libavahi}" = "xyes"]) -]) - -AC_DEFUN([PANDORA_HAVE_LIBAVAHI],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBAVAHI]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBAVAHI],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBAVAHI]) - AS_IF([test "x${ac_cv_libavahi}" = "xno"], - AC_MSG_ERROR([libavahi is required for ${PACKAGE}])) -]) diff --git a/m4/pandora_have_libhaildb.m4 b/m4/pandora_have_libhaildb.m4 deleted file mode 100644 index b957f64c..00000000 --- a/m4/pandora_have_libhaildb.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([_PANDORA_SEARCH_LIBHAILDB],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - dnl -------------------------------------------------------------------- - dnl Check for libhaildb - dnl -------------------------------------------------------------------- - - AC_ARG_ENABLE([libhaildb], - [AS_HELP_STRING([--disable-libhaildb], - [Build with libhaildb support @<:@default=on@:>@])], - [ac_enable_libhaildb="$enableval"], - [ac_enable_libhaildb="yes"]) - - - AS_IF([test "x$ac_enable_libhaildb" = "xyes"],[ - AC_LIB_HAVE_LINKFLAGS(haildb,,[ - #include - ],[ - ib_update_table_statistics(NULL); - ]) - AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[ - AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h]) - ]) - ],[ - ac_cv_libhaildb="no" - ]) - AM_CONDITIONAL(HAVE_LIBHAILDB, [test "x${ac_cv_libhaildb}" = "xyes"]) -]) - -AC_DEFUN([PANDORA_HAVE_LIBHAILDB],[ - AC_REQUIRE([_PANDORA_SEARCH_LIBHAILDB]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBHAILDB],[ - AC_REQUIRE([PANDORA_HAVE_LIBHAILDB]) - AS_IF([test "x${ac_cv_libhaildb}" = "xno"], - AC_MSG_ERROR([libhaildb 2.3.2 or later is required for ${PACKAGE}])) -]) diff --git a/m4/pandora_have_libpcre.m4 b/m4/pandora_have_libpcre.m4 deleted file mode 100644 index bfa733a1..00000000 --- a/m4/pandora_have_libpcre.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check for libpcre -#-------------------------------------------------------------------- - - -AC_DEFUN([_PANDORA_SEARCH_LIBPCRE],[ - AC_REQUIRE([AC_LIB_PREFIX]) - - AC_LIB_HAVE_LINKFLAGS(pcre,, - [#include ], - [ - pcre *re= NULL; - pcre_version(); - ]) - AS_IF([test "x$ac_cv_libpcre" = "xno"], - [ - unset ac_cv_libpcre - unset HAVE_LIBPCRE - unset LIBPCRE - unset LIBPCRE_PREFIX - unset LTLIBPCRE - AC_LIB_HAVE_LINKFLAGS(pcre,, - [#include ], - [ - pcre *re= NULL; - pcre_version(); - ]) - AS_IF([test "x$ac_cv_libpcre" = "xyes"], [ - ac_cv_pcre_location="" - ]) - ],[ - ac_cv_pcre_location="" - ]) - - AM_CONDITIONAL(HAVE_LIBPCRE, [test "x${ac_cv_libpcre}" = "xyes"]) -]) - -AC_DEFUN([_PANDORA_HAVE_LIBPCRE],[ - - AC_ARG_ENABLE([libpcre], - [AS_HELP_STRING([--disable-libpcre], - [Build with libpcre support @<:@default=on@:>@])], - [ac_enable_libpcre="$enableval"], - [ac_enable_libpcre="yes"]) - - _PANDORA_SEARCH_LIBPCRE -]) - - -AC_DEFUN([PANDORA_HAVE_LIBPCRE],[ - AC_REQUIRE([_PANDORA_HAVE_LIBPCRE]) -]) - -AC_DEFUN([_PANDORA_REQUIRE_LIBPCRE],[ - ac_enable_libpcre="yes" - _PANDORA_SEARCH_LIBPCRE - - AS_IF([test x$ac_cv_libpcre = xno],[ - AC_MSG_ERROR([libpcre is required for ${PACKAGE}. On Debian this can be found in libpcre3-dev. On RedHat this can be found in pcre-devel.]) - ],[ - AC_DEFINE_UNQUOTED(PCRE_HEADER,[${ac_cv_pcre_location}], - [Location of pcre header]) - ]) -]) - -AC_DEFUN([PANDORA_REQUIRE_LIBPCRE],[ - AC_REQUIRE([_PANDORA_REQUIRE_LIBPCRE]) -]) diff --git a/m4/pandora_optimize.m4 b/m4/pandora_optimize.m4 deleted file mode 100644 index dcee0648..00000000 --- a/m4/pandora_optimize.m4 +++ /dev/null @@ -1,73 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([PANDORA_OPTIMIZE],[ - dnl Build optimized or debug version ? - dnl First check for gcc and g++ - AS_IF([test "$GCC" = "yes" -a "$INTELCC" = "no"],[ - - dnl The following is required for portable results of floating point - dnl calculations on PowerPC. The same must also be done for IA-64, but - dnl this options is missing in the IA-64 gcc backend. - case "$target_cpu" in - *ppc* | *powerpc*) - AM_CFLAGS="-mno-fused-madd ${AM_CFLAGS}" - AM_CXXFLAGS="-mno-fused-madd ${AM_CXXFLAGS}" - ;; - esac - - AM_CPPFLAGS="-ggdb ${AM_CPPFLAGS}" - - DEBUG_CFLAGS="-O0" - DEBUG_CXXFLAGS="-O0" - - OPTIMIZE_CFLAGS="-O2" - OPTIMIZE_CXXFLAGS="-O2" - ]) - AS_IF([test "$INTELCC" = "yes"],[ - AM_CPPFLAGS="-g ${AM_CPPFLAGS}" - - DEBUG_CFLAGS="-O0" - DEBUG_CXXFLAGS="-O0" - - OPTIMIZE_CFLAGS="-xHOST -O2 -no-prec-div -static" - OPTIMIZE_CXXFLAGS="${OPTIMIZE_CFLAGS}" - - ]) - AS_IF([test "$SUNCC" = "yes"],[ - dnl Once we can use a modern autoconf, we can replace the -xc99=all here - dnl with using AC_CC_STD_C99 above - CC="${CC} -xc99=all" - CXX="${CXX} -xlang=c99" - - AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}" - AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -library=Crun -template=no%extdef ${AM_CXXFLAGS}" - - DEBUG_CXXFLAGS="-g" - - dnl TODO: Make a test for -xO4 usability here - OPTIMIZE_FLAGS="-xO3 -xlibmil -xdepend -xbuiltin" - OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS}" - OPTIMIZE_CXXFLAGS="-g0 ${OPTIMIZE_FLAGS}" - - ]) - - AC_ARG_WITH([debug], - [AS_HELP_STRING([--with-debug], - [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], - [with_debug=$withval], - [with_debug=no]) - AS_IF([test "$with_debug" = "yes"],[ - # Debugging. No optimization. - AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG" - AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG" - AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.]) - ],[ - # Optimized version. No debug - AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}" - AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}" - AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.]) - ]) -]) diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4 deleted file mode 100644 index 2372e0d6..00000000 --- a/m4/pandora_platform.m4 +++ /dev/null @@ -1,122 +0,0 @@ -dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- -dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl -dnl pandora-build: A pedantic build system -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl From Monty Taylor - -AC_DEFUN([PANDORA_PLATFORM],[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_CANONICAL_TARGET]) - - dnl Canonicalize the configuration name. - - AC_DEFINE_UNQUOTED([HOST_VENDOR], ["$host_vendor"],[Vendor of Build System]) - AC_DEFINE_UNQUOTED([HOST_OS], ["$host_os"], [OS of Build System]) - AC_DEFINE_UNQUOTED([HOST_CPU], ["$host_cpu"], [CPU of Build System]) - - AC_DEFINE_UNQUOTED([TARGET_VENDOR], ["$target_vendor"],[Vendor of Target System]) - AC_DEFINE_UNQUOTED([TARGET_OS], ["$target_os"], [OS of Target System]) - AC_DEFINE_UNQUOTED([TARGET_CPU], ["$target_cpu"], [CPU of Target System]) - - - case "$host_os" in - *solaris*) - AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[ - CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - ]) - - AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[ - LDFLAGS="${LDFLAGS} -L/usr/local/lib" - ]) - ;; - *freebsd*) - AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[ - CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include" - ]) - - AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[ - LDFLAGS="${LDFLAGS} -L/usr/local/lib" - ]) - ;; - esac - - PANDORA_OPTIMIZE_BITFIELD=1 - - case "$target_os" in - *linux*) - TARGET_LINUX="true" - AC_SUBST(TARGET_LINUX) - AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux]) - ;; - *darwin*) - TARGET_OSX="true" - AC_SUBST(TARGET_OSX) - AC_DEFINE([TARGET_OS_OSX], [1], [Whether we build for OSX]) - ;; - *solaris*) - TARGET_SOLARIS="true" - PANDORA_OPTIMIZE_BITFIELD=0 - AS_IF([test "x${USE_NLS}" = "xyes"],[LIBS="${LIBS} -lintl"]) - AC_SUBST(TARGET_SOLARIS) - AC_DEFINE([TARGET_OS_SOLARIS], [1], [Whether we are building for Solaris]) - ;; - *freebsd*) - TARGET_FREEBSD="true" - AC_SUBST(TARGET_FREEBSD) - AC_DEFINE([TARGET_OS_FREEBSD], [1], [Whether we are building for FreeBSD]) - AC_DEFINE([__APPLE_CC__],[1],[Workaround for bug in FreeBSD headers]) - ;; - *mingw32*) - TARGET_WINDOWS="true" - AC_SUBST(TARGET_WINDOWS) - AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) - AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) - AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) - AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) - AH_BOTTOM([ -#ifndef HAVE_SYS_SOCKET_H -# define SHUT_RD SD_RECEIVE -# define SHUT_WR SD_SEND -# define SHUT_RDWR SD_BOTH -#endif - ]) - - LIBS="$LIBS -lwsock32 -lws2_32" - AM_CFLAGS="${AM_CFLAGS} -I\${top_srcdir}/win32/mingw -I\${top_builddir}/win32/mingw -I\${top_srcdir}/win32 -I\${top_builddir}/win32" - ;; - esac - AM_CONDITIONAL(BUILD_WIN32, [test "x${TARGET_WINDOWS}" = "xtrue"]) - AM_CONDITIONAL(TARGET_OSX, [test "x${TARGET_OSX}" = "xtrue"]) - AM_CONDITIONAL(TARGET_LINUX, [test "x${TARGET_LINUX}" = "xtrue"]) - - AC_SUBST(PANDORA_OPTIMIZE_BITFIELD) - - AC_CHECK_DECL([__clang__], [CLANG="yes"], [CLANG="no"]) - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) - AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"]) - - AS_IF([test "$INTELCC" = "yes"], [enable_rpath=no]) - - dnl By default, Sun Studio grabs special versions of limits.h and string.h - dnl when you use and . By setting this define, we can - dnl disable that and cause those to wrap the standard headers instead. - dnl http://www.stlport.com/doc/configure.html - AS_IF([test "$SUNCC" = "yes"],[ - AC_DEFINE([_STLP_NO_NEW_C_HEADERS],[1], - [Cause Sun Studio to not be quite so strict with standards conflicts]) - ]) - - AS_IF([test "x$TARGET_OSX" = "xtrue"],[ - AS_IF([test "x$ac_enable_fat_binaries" = "xyes"],[ - AM_CFLAGS="-arch i386 -arch x86_64 -arch ppc" - AM_CXXFLAGS="-arch i386 -arch x86_64 -arch ppc" - AM_LDFLAGS="-arch i386 -arch x86_64 -arch ppc" - ]) - ]) - -]) diff --git a/m4/pandora_stack_direction.m4 b/m4/pandora_stack_direction.m4 deleted file mode 100644 index 635586a5..00000000 --- a/m4/pandora_stack_direction.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems -dnl This file is free software; Sun Microsystems -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -#-------------------------------------------------------------------- -# Check what direction the stack runs in -#-------------------------------------------------------------------- - -AC_DEFUN([PANDORA_STACK_DIRECTION],[ - AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_CACHE_CHECK([stack direction], [ac_cv_c_stack_direction],[ - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#include - int find_stack_direction () - { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; - } - ]],[[ - exit (find_stack_direction() < 0); - ]])],[ - ac_cv_c_stack_direction=1 - ],[ - ac_cv_c_stack_direction=-1 - ]) - ]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) -]) - - - diff --git a/m4/pandora_swig.m4 b/m4/pandora_swig.m4 deleted file mode 100644 index 89f12dd6..00000000 --- a/m4/pandora_swig.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- -dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl -dnl pandora-build: A pedantic build system -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystem -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl From Monty Taylor - -AC_DEFUN([PANDORA_SWIG],[ - - AC_PROG_SWIG(1.3.31) - - AC_DEFINE_UNQUOTED([SWIG_TYPE_TABLE], - [$PACKAGE], - [Type Table name for SWIG symbol table]) - - dnl Have to hard-code /usr/local/include and /usr/include into the path. - dnl I hate this. Why is swig sucking me - SWIG="$SWIG \${DEFS} -I\${top_srcdir} -I\${top_builddir} -I/usr/local/include -I/usr/include" - AC_SUBST([SWIG]) - - -]) - -AC_DEFUN([PANDORA_SWIG_PYTHON3],[ - AC_REQUIRE([PANDORA_SWIG]) - AS_IF([test "x$SWIG" != "x"],[ - AC_CACHE_CHECK([if swig supports Python3], - [ac_cv_swig_has_python3_], - [ - AS_IF([$SWIG -python -help 2>&1 | grep py3 > /dev/null], - [ac_cv_swig_has_python3_=yes], - [ac_cv_swig_has_python3_=no]) - ]) - ]) -]) diff --git a/rpm.am b/rpm.am deleted file mode 100644 index 16a68c1c..00000000 --- a/rpm.am +++ /dev/null @@ -1,36 +0,0 @@ -# vim:ft=automake - -rpm-build: support/$(PACKAGE).spec distcheck - @rm -f *.rpm - @rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm - @rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm - @mkdir -p ~/rpmbuild/BUILD/ - @mkdir -p ~/rpmbuild/RPMS/i386/ - @mkdir -p ~/rpmbuild/RPMS/i686/ - @mkdir -p ~/rpmbuild/RPMS/noarch/ - @mkdir -p ~/rpmbuild/RPMS/x86_64/ - @mkdir -p ~/rpmbuild/SOURCES/ - @mkdir -p ~/rpmbuild/SPECS/ - @mkdir -p ~/rpmbuild/SRPMS/ - @cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/ - @rpmbuild -ba support/$(PACKAGE).spec - @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm . - @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm . - @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm . - @cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm . - -rpm-sign: rpm-build - @rpm --addsign *.rpm - @rpm --checksig *.rpm - -clean-rpm: - @rm -f *.tar.gz - @rm -f *.src.rpm - @rm -f *.rpm - -rpm: clean-rpm support/$(PACKAGE).spec rpm-build - -release: rpm rpm-sign - -auto-rpmbuild: - @auto-br-rpmbuild -ba support/libmemcached.spec diff --git a/rpm/include.am b/rpm/include.am new file mode 100644 index 00000000..16a68c1c --- /dev/null +++ b/rpm/include.am @@ -0,0 +1,36 @@ +# vim:ft=automake + +rpm-build: support/$(PACKAGE).spec distcheck + @rm -f *.rpm + @rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm + @rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm + @mkdir -p ~/rpmbuild/BUILD/ + @mkdir -p ~/rpmbuild/RPMS/i386/ + @mkdir -p ~/rpmbuild/RPMS/i686/ + @mkdir -p ~/rpmbuild/RPMS/noarch/ + @mkdir -p ~/rpmbuild/RPMS/x86_64/ + @mkdir -p ~/rpmbuild/SOURCES/ + @mkdir -p ~/rpmbuild/SPECS/ + @mkdir -p ~/rpmbuild/SRPMS/ + @cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/ + @rpmbuild -ba support/$(PACKAGE).spec + @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm . + @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm . + @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm . + @cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm . + +rpm-sign: rpm-build + @rpm --addsign *.rpm + @rpm --checksig *.rpm + +clean-rpm: + @rm -f *.tar.gz + @rm -f *.src.rpm + @rm -f *.rpm + +rpm: clean-rpm support/$(PACKAGE).spec rpm-build + +release: rpm rpm-sign + +auto-rpmbuild: + @auto-br-rpmbuild -ba support/libmemcached.spec diff --git a/tests/cycle.cc b/tests/cycle.cc index 32df0da0..e18037df 100644 --- a/tests/cycle.cc +++ b/tests/cycle.cc @@ -43,7 +43,7 @@ #include using namespace libtest; -#include +#include static test_return_t server_startup_single_TEST(void *obj) { diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index aad0961b..9b246b17 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/tests/libmemcached-1.0/basic.cc b/tests/libmemcached-1.0/basic.cc index 2c6cf8ee..392c6778 100644 --- a/tests/libmemcached-1.0/basic.cc +++ b/tests/libmemcached-1.0/basic.cc @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include "libmemcached/is.h" #include "tests/basic.h" diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc index 52ac9b25..6808089a 100644 --- a/tests/libmemcached-1.0/debug.cc +++ b/tests/libmemcached-1.0/debug.cc @@ -42,7 +42,7 @@ using namespace libtest; -#include +#include #include #include diff --git a/tests/libmemcached-1.0/deprecated.cc b/tests/libmemcached-1.0/deprecated.cc index d7ebdb05..c5096ff7 100644 --- a/tests/libmemcached-1.0/deprecated.cc +++ b/tests/libmemcached-1.0/deprecated.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include test_return_t server_list_null_test(memcached_st *ptr) diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc index ee6100fe..27583ead 100644 --- a/tests/libmemcached-1.0/dump.cc +++ b/tests/libmemcached-1.0/dump.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/libmemcached-1.0/encoding_key.cc b/tests/libmemcached-1.0/encoding_key.cc index b9302f5a..8d3e0dbc 100644 --- a/tests/libmemcached-1.0/encoding_key.cc +++ b/tests/libmemcached-1.0/encoding_key.cc @@ -39,7 +39,7 @@ #include #include -#include +#include #include "tests/libmemcached-1.0/encoding_key.h" diff --git a/tests/libmemcached-1.0/error_conditions.cc b/tests/libmemcached-1.0/error_conditions.cc index 66e7c44e..b5a05c77 100644 --- a/tests/libmemcached-1.0/error_conditions.cc +++ b/tests/libmemcached-1.0/error_conditions.cc @@ -40,8 +40,8 @@ #define BUILDING_LIBMEMCACHED -#include -#include +#include +#include "libmemcached/is.h" #include diff --git a/tests/libmemcached-1.0/ketama.cc b/tests/libmemcached-1.0/ketama.cc index 045ae074..de8ac905 100644 --- a/tests/libmemcached-1.0/ketama.cc +++ b/tests/libmemcached-1.0/ketama.cc @@ -37,10 +37,11 @@ #include #include -#include -#include -#include -#include +#include + +#include "libmemcached/server_instance.h" +#include "libmemcached/continuum.hpp" +#include "libmemcached/instance.h" #include #include diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 10b84683..75b2ba90 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -76,7 +76,7 @@ using namespace libtest; -#include +#include #include "tests/hash_results.h" diff --git a/tests/libmemcached-1.0/namespace.cc b/tests/libmemcached-1.0/namespace.cc index 57ecc606..cbe4d1b8 100644 --- a/tests/libmemcached-1.0/namespace.cc +++ b/tests/libmemcached-1.0/namespace.cc @@ -40,7 +40,7 @@ using namespace libtest; -#include +#include #include diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc index f506a8f1..6a75a2dc 100644 --- a/tests/libmemcached-1.0/parser.cc +++ b/tests/libmemcached-1.0/parser.cc @@ -44,8 +44,8 @@ using namespace libtest; #include #include -#include -#include +#include +#include #include #include diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc index f1c03d07..11125493 100644 --- a/tests/libmemcached-1.0/print.cc +++ b/tests/libmemcached-1.0/print.cc @@ -43,7 +43,7 @@ using namespace libtest; #include -#include +#include #include "tests/print.h" diff --git a/tests/libmemcached-1.0/replication.cc b/tests/libmemcached-1.0/replication.cc index 198b83cc..2e1808ea 100644 --- a/tests/libmemcached-1.0/replication.cc +++ b/tests/libmemcached-1.0/replication.cc @@ -40,8 +40,10 @@ using namespace libtest; -#include -#include +#include + +#include "libmemcached/server_instance.h" + #include #include diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc index 6dae4237..65ce0310 100644 --- a/tests/libmemcached-1.0/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc @@ -43,7 +43,7 @@ using namespace libtest; Test cases */ -#include +#include static test_return_t pre_sasl(memcached_st *) { diff --git a/tests/libmemcached-1.0/server_add.cc b/tests/libmemcached-1.0/server_add.cc index b343bf9c..8fd717c6 100644 --- a/tests/libmemcached-1.0/server_add.cc +++ b/tests/libmemcached-1.0/server_add.cc @@ -40,7 +40,7 @@ using namespace libtest; -#include +#include #include diff --git a/tests/libmemcached-1.0/setup_and_teardowns.cc b/tests/libmemcached-1.0/setup_and_teardowns.cc index 4e5c0616..ad2126fa 100644 --- a/tests/libmemcached-1.0/setup_and_teardowns.cc +++ b/tests/libmemcached-1.0/setup_and_teardowns.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include "tests/print.h" #include "tests/libmemcached-1.0/setup_and_teardowns.h" diff --git a/tests/libmemcached-1.0/stat.cc b/tests/libmemcached-1.0/stat.cc index 5a16495e..605c8baa 100644 --- a/tests/libmemcached-1.0/stat.cc +++ b/tests/libmemcached-1.0/stat.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/libmemcached-1.0/string.cc b/tests/libmemcached-1.0/string.cc index bb90e94b..babe1bf2 100644 --- a/tests/libmemcached-1.0/string.cc +++ b/tests/libmemcached-1.0/string.cc @@ -40,9 +40,10 @@ #include -#include -#include -#include +#include + +#include "libmemcached/string.hpp" +#include "libmemcached/is.h" #include diff --git a/tests/libmemcached-1.0/virtual_buckets.cc b/tests/libmemcached-1.0/virtual_buckets.cc index 82195e80..5ed812fa 100644 --- a/tests/libmemcached-1.0/virtual_buckets.cc +++ b/tests/libmemcached-1.0/virtual_buckets.cc @@ -42,7 +42,7 @@ using namespace libtest; #include -#include +#include #include diff --git a/tests/memcapable.cc b/tests/memcapable.cc index 93ad1860..09b47efa 100644 --- a/tests/memcapable.cc +++ b/tests/memcapable.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memcat.cc b/tests/memcat.cc index d86213c0..ed606d1d 100644 --- a/tests/memcat.cc +++ b/tests/memcat.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memcp.cc b/tests/memcp.cc index 04c47f80..3c8d6b02 100644 --- a/tests/memcp.cc +++ b/tests/memcp.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memdump.cc b/tests/memdump.cc index 6f9330a5..840c1a17 100644 --- a/tests/memdump.cc +++ b/tests/memdump.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memerror.cc b/tests/memerror.cc index 76cc96c4..9b3ddd35 100644 --- a/tests/memerror.cc +++ b/tests/memerror.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memexist.cc b/tests/memexist.cc index e3a57c5c..47496a64 100644 --- a/tests/memexist.cc +++ b/tests/memexist.cc @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include using namespace libtest; diff --git a/tests/memflush.cc b/tests/memflush.cc index 3ba91459..0f708a9b 100644 --- a/tests/memflush.cc +++ b/tests/memflush.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memrm.cc b/tests/memrm.cc index 58da088c..1f5f722a 100644 --- a/tests/memrm.cc +++ b/tests/memrm.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memslap.cc b/tests/memslap.cc index c1500829..792d15fb 100644 --- a/tests/memslap.cc +++ b/tests/memslap.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memstat.cc b/tests/memstat.cc index 9b8cb836..b2dea7e9 100644 --- a/tests/memstat.cc +++ b/tests/memstat.cc @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace libtest; diff --git a/tests/memtouch.cc b/tests/memtouch.cc index 48cadcf2..207ac1dc 100644 --- a/tests/memtouch.cc +++ b/tests/memtouch.cc @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include using namespace libtest;