Fix all include location, and drop versions of the library that were never shipped.
authorBrian Aker <brian@tangent.org>
Sat, 13 Oct 2012 11:28:52 +0000 (07:28 -0400)
committerBrian Aker <brian@tangent.org>
Sat, 13 Oct 2012 11:28:52 +0000 (07:28 -0400)
103 files changed:
Makefile.am
clients/execute.cc
clients/execute.h
clients/generator.cc
clients/include.am
clients/memcapable.cc
clients/memcat.cc
clients/memcp.cc
clients/memdump.cc
clients/memerror.cc
clients/memexist.cc
clients/memflush.cc
clients/memparse.cc
clients/memping.cc
clients/memrm.cc
clients/memslap.cc
clients/memstat.cc
clients/memtouch.cc
clients/utilities.cc
configure.ac
example/t/memcached_light.cc
libhashkit-1.0/configure.h.in
libhashkit-1.0/include.am
libhashkit/include.m4 [new file with mode: 0644]
libmemcached-1.0/configure.h.in
libmemcached-1.0/include.am
libmemcached-1.0/struct/include.am
libmemcached-1.0/t/c_sasl_test.c
libmemcached-1.0/t/c_test.c
libmemcached-1.0/types/include.am
libmemcached-1.2/allocators.h [deleted file]
libmemcached-1.2/auto.h [deleted file]
libmemcached-1.2/behavior.h [deleted file]
libmemcached-1.2/callback.h [deleted file]
libmemcached-1.2/configure.h.in [deleted file]
libmemcached-1.2/delete.h [deleted file]
libmemcached-1.2/dump.h [deleted file]
libmemcached-1.2/error.h [deleted file]
libmemcached-1.2/exist.h [deleted file]
libmemcached-1.2/fetch.h [deleted file]
libmemcached-1.2/flush.h [deleted file]
libmemcached-1.2/flush_buffers.h [deleted file]
libmemcached-1.2/get.h [deleted file]
libmemcached-1.2/hash.h [deleted file]
libmemcached-1.2/include.am [deleted file]
libmemcached-1.2/memcached.h [deleted file]
libmemcached-1.2/options.h [deleted file]
libmemcached-1.2/platform.h [deleted file]
libmemcached-1.2/result.h [deleted file]
libmemcached-1.2/return.h [deleted file]
libmemcached-1.2/sasl.h [deleted file]
libmemcached-1.2/server.h [deleted file]
libmemcached-1.2/stats.h [deleted file]
libmemcached-1.2/storage.h [deleted file]
libmemcached-1.2/strerror.h [deleted file]
libmemcached-1.2/t/c_test.c [deleted file]
libmemcached-1.2/t/cc_test.cc [deleted file]
libmemcached-1.2/t/include.am [deleted file]
libmemcached-1.2/touch.h [deleted file]
libmemcached-1.2/types.h [deleted file]
libmemcached-1.2/verbosity.h [deleted file]
libmemcached-1.2/version.h [deleted file]
libmemcached-1.2/visibility.h [deleted file]
libmemcached-2.0/configure.h.in [deleted file]
libmemcached-2.0/error.h [deleted file]
libmemcached-2.0/include.am [deleted file]
libmemcached-2.0/memcached.h [deleted file]
libmemcachedprotocol/include.am
m4/ax_hex_version.m4
m4/bottom.m4
rpm.am [deleted file]
rpm/include.am [new file with mode: 0644]
tests/cycle.cc
tests/libmemcached-1.0/atomsmasher.cc
tests/libmemcached-1.0/basic.cc
tests/libmemcached-1.0/debug.cc
tests/libmemcached-1.0/deprecated.cc
tests/libmemcached-1.0/dump.cc
tests/libmemcached-1.0/encoding_key.cc
tests/libmemcached-1.0/error_conditions.cc
tests/libmemcached-1.0/ketama.cc
tests/libmemcached-1.0/mem_functions.cc
tests/libmemcached-1.0/namespace.cc
tests/libmemcached-1.0/parser.cc
tests/libmemcached-1.0/print.cc
tests/libmemcached-1.0/replication.cc
tests/libmemcached-1.0/sasl.cc
tests/libmemcached-1.0/server_add.cc
tests/libmemcached-1.0/setup_and_teardowns.cc
tests/libmemcached-1.0/stat.cc
tests/libmemcached-1.0/string.cc
tests/libmemcached-1.0/virtual_buckets.cc
tests/memcapable.cc
tests/memcat.cc
tests/memcp.cc
tests/memdump.cc
tests/memerror.cc
tests/memexist.cc
tests/memflush.cc
tests/memrm.cc
tests/memslap.cc
tests/memstat.cc
tests/memtouch.cc

index 08d36a4ba90cb10a5a0c391394bd482585e9e2b6..cc6bc018054cc03788addf235a84b34aafc1c057 100644 (file)
@@ -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
index f877851e8adb50743779f0cee7844af535df3f1d..cf7779e5140c8f2afada67ebc5c1ab8c81e8d45d 100644 (file)
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
index 05678c4df27b96915f36e64ea33443842285a012..ebf92f628db56ffe4873f9aaddc7e7f5387b44f3 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "libmemcached/memcached.h"
+#include <libmemcached-1.0/memcached.h>
 #include "clients/generator.h"
 
 #ifdef __cplusplus
index d24ad139bad45f1d5dd601bec9ad454286393ccc..e41d9c58acecdf53f9a7a0ed90a4917f1ee62f23 100644 (file)
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
index aeda9f85bdb340df8c4325bd942592cbd39fa0ea..98319e1e528bc5ab86e7c9002826fda2770c2b77 100644 (file)
@@ -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:
index 25b470b017634394329afc31ddc6f631ee2598ed..2026aceec9a4139ecd4a7190c256fa101597c543 100644 (file)
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
 #include <unistd.h>
 
 #include <libmemcached-1.0/memcached.h>
-#include <libmemcached/socket.hpp>
-#include <libmemcached/memcached/protocol_binary.h>
-#include <libmemcached/byteorder.h>
-#include <clients/utilities.h>
+
+#include "libmemcached/socket.hpp"
+#include "libmemcached/memcached/protocol_binary.h"
+#include "libmemcached/byteorder.h"
+#include "clients/utilities.h"
 
 #include <vector>
 
index c93f1a21d7812fe63824e2879d0d283356fe7725..ef2877810d92de7ef9fd6f9c04a70c52ab0321b6 100644 (file)
@@ -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 <getopt.h>
 #include <iostream>
 #include <unistd.h>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "utilities.h"
 
index c56a79cdb7eff4109cb0247424b065e8f9a7c577..4ad0919d008a540d763cea73718c71762aa1a7fe 100644 (file)
@@ -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 <unistd.h>
 
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "client_options.h"
 #include "utilities.h"
index fded16f2ae8793e9232ef644cf1f684cb45efc1f..5b33372838d0f788c50a822f880682f8d3e8ea7a 100644 (file)
@@ -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 <sys/types.h>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "client_options.h"
 #include "utilities.h"
index 17bc531c96473ed735fb214ae19c1c2ca76c2ac1..910b2a6da71d2ab10462513401cd766969a6a6eb 100644 (file)
@@ -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 <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "utilities.h"
 
index c3871dea9deefd9181ea91d7a0aee949b41bba41..af9a72c9766bb573e3d39442f432488875af793e 100644 (file)
@@ -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 <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include "client_options.h"
 #include "utilities.h"
 
index 81bb2574f27190e64a1d6dba4ddcaa8623ec33cb..5342d757dfa396c5b253a7a11f4017a2c555b72d 100644 (file)
@@ -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 <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include "client_options.h"
 #include "utilities.h"
 
index c2557dfd325ad8c52bb311e767f9ddf17284f929..ab4cee9eb7d72e949f97b0e3077c412d646dcb19 100644 (file)
@@ -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 <cstring>
 #include <iostream>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 int main(int argc, char *argv[])
 {
index bcc07cd3921397661ad44941a4cf9d2ec4c32a42..f4fcec861a34e06d6b9701c298785c5dffd5331c 100644 (file)
@@ -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 <unistd.h>
 #include <string.h>
 #include <getopt.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 #include "client_options.h"
 #include "utilities.h"
 
index 61697cd109f9cd81ffc32afd5e2e79a2be4ce60c..3b7f8a4b351ea72c73d6e63a4d74d7fc1a370873 100644 (file)
@@ -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 <iostream>
 #include <unistd.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include "client_options.h"
 #include "utilities.h"
 
index 8b694835d37cbc6cc6f6af1a469b9457d1b28079..777820a02f9e66d72fd1aa16543a34ca77107647 100644 (file)
@@ -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 <iostream>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "client_options.h"
 #include "utilities.h"
index 1eab6f9f30623b52d503c6ecbafdc2f005104780..6fd42d6c40c77305c1e58d1c3fa5010747f4da01 100644 (file)
@@ -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 <sys/types.h>
 #include <sys/types.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "client_options.h"
 #include "utilities.h"
index 4f3be80e8a9b57b68c6d1408a85369ee2ae3f5d3..8bb3c78c3904ec73d31b59ba3e5e1d6f4c349893 100644 (file)
@@ -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 <getopt.h>
 #include <iostream>
 #include <unistd.h>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "utilities.h"
 
index bae9407642ee56e23508d1e427c4d5b3c7d2d8b9..ddc83eda82a8a42ec7bea163ec88ab5a9a6fa79c 100644 (file)
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
index 98c29e89c3c2ffe0a72dd3eb37ac43f3c01a873b..09d8ecb360d433ff0bbec1e7ba89543d277cbfbf 100644 (file)
@@ -35,12 +35,14 @@ 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
@@ -270,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
   ])
index e76841a17360d3b809578634158bb836510b95b0..c5956b24c3840ab3e0b096de18178f018a195dc5 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "tests/libmemcached-1.0/memcached_get.h"
 
index 8aec3865f5da3c6117d56670d4610228679aab1b..4fab993df5cfe55831fe3670a5d7ad07241f2ff9 100644 (file)
@@ -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
index a5f849c8bf55a9b2ea56b1d1cc56b30c54a97cc9..6e60d7456819cf296330716157d5b04bb164be6c 100644 (file)
@@ -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 (file)
index 0000000..eb85c05
--- /dev/null
@@ -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])
index 7b48be2a6ed848add52d9eae3c2b59eafff1f8b1..3f0465a0ee8f8b71f0ebd1847a7203b4f8acc043 100644 (file)
@@ -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
 }
index a5cd175b23be084dd0d382d67f044eee4192ff99..19e48289aa38de3c82988e9ec2717ef701828add 100644 (file)
@@ -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
index eff3c520d10a10f845d3f8f627e1cae8141f9024..fc2d9223c5ad7dfc9b8ac83068b31550d5826047 100644 (file)
@@ -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
index 8a7c4e3db6fb93aa1fb7b3831f293b2fe2404cb7..93f729d122f219f93247de3ce6d8aa748d4b6b9c 100644 (file)
@@ -44,7 +44,7 @@
 #include <sasl/sasl.h>
 #endif
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 int main(void)
 {
index 009014ee194fd0c4c56f54ffa81e3adaa623358d..40935fac52991058eb83288228640d273a648b28 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 int main(void)
 {
index d102c3138c0d76c85e3da05da8c645e0ac5c4eec..fa33046941f7021dab6df150c8d134527b43c037 100644 (file)
@@ -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 (file)
index 0fd7bef..0000000
+++ /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 (file)
index 13e0218..0000000
+++ /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 (file)
index 3ccefc0..0000000
+++ /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 (file)
index ddd39ae..0000000
+++ /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 (file)
index 167c4f2..0000000
+++ /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 (file)
index f01659c..0000000
+++ /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 (file)
index 9cf3c2d..0000000
+++ /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 (file)
index 6b2a581..0000000
+++ /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 (file)
index 4147c3d..0000000
+++ /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 (file)
index 2c26d39..0000000
+++ /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 (file)
index f38e3c0..0000000
+++ /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 (file)
index 42484b9..0000000
+++ /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 (file)
index bd49aeb..0000000
+++ /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 (file)
index a9b7d25..0000000
+++ /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 (file)
index 061b79d..0000000
+++ /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 (file)
index eeb3a8b..0000000
+++ /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 <inttypes.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-
-#if !defined(__cplusplus)
-# include <stdbool.h>
-#endif
-
-#include <libmemcached-1.0/visibility.h>
-#include <libmemcached-1.0/configure.h>
-#include <libmemcached-1.0/platform.h>
-#include <libmemcached-1.0/constants.h>
-#include <libmemcached-1.0/return.h>
-#include <libmemcached-1.0/types.h>
-#include <libmemcached-1.0/basic_string.h>
-#include <libmemcached-1.0/string.h>
-#include <libmemcached-1.0/error.h>
-#include <libmemcached-1.0/stats.h>
-#include <libhashkit-1.0/hashkit.h>
-
-// Everything above this line must be in the order specified.
-#include <libmemcached-1.2/allocators.h>
-#include <libmemcached-1.2/analyze.h>
-#include <libmemcached-1.2/auto.h>
-#include <libmemcached-1.2/behavior.h>
-#include <libmemcached-1.2/callback.h>
-#include <libmemcached-1.2/delete.h>
-#include <libmemcached-1.2/dump.h>
-#include <libmemcached-1.2/exist.h>
-#include <libmemcached-1.2/fetch.h>
-#include <libmemcached-1.2/flush.h>
-#include <libmemcached-1.2/flush_buffers.h>
-#include <libmemcached-1.2/get.h>
-#include <libmemcached-1.2/hash.h>
-#include <libmemcached-1.2/options.h>
-#include <libmemcached-1.2/parse.h>
-#include <libmemcached-1.2/quit.h>
-#include <libmemcached-1.2/result.h>
-#include <libmemcached-1.2/server.h>
-#include <libmemcached-1.2/server_list.h>
-#include <libmemcached-1.2/storage.h>
-#include <libmemcached-1.2/strerror.h>
-#include <libmemcached-1.2/touch.h>
-#include <libmemcached-1.2/verbosity.h>
-#include <libmemcached-1.2/version.h>
-#include <libmemcached-1.2/sasl.h>
-
-#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 (file)
index f5a6e06..0000000
+++ /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 (file)
index 763feba..0000000
+++ /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 <winsock2.h>
-#include <ws2tcpip.h>
-typedef short in_port_t;
-typedef SOCKET memcached_socket_t;
-#else
-typedef int memcached_socket_t;
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
-
-#endif /* WIN32 */
diff --git a/libmemcached-1.2/result.h b/libmemcached-1.2/result.h
deleted file mode 100644 (file)
index 4f7da4d..0000000
+++ /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 (file)
index e5788c5..0000000
+++ /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 (file)
index 6cbaec3..0000000
+++ /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 <sasl/sasl.h>
-#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 (file)
index 7359eff..0000000
+++ /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 (file)
index ebba16f..0000000
+++ /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 (file)
index 5c0c2cb..0000000
+++ /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 (file)
index b6ec12d..0000000
+++ /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 (file)
index e8960f4..0000000
+++ /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 <stdlib.h>
-
-#include <libmemcached/memcached.h>
-
-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 (file)
index e8960f4..0000000
+++ /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 <stdlib.h>
-
-#include <libmemcached/memcached.h>
-
-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 (file)
index 6c11f2d..0000000
+++ /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 (file)
index 631d3fd..0000000
+++ /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 (file)
index a342e9e..0000000
+++ /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 (file)
index 3882592..0000000
+++ /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 (file)
index bfda163..0000000
+++ /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 (file)
index 168281b..0000000
+++ /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 (file)
index 56ec61f..0000000
+++ /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 (file)
index 52cc759..0000000
+++ /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 (file)
index 8d7a066..0000000
+++ /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 (file)
index ef2adf2..0000000
+++ /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 <inttypes.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-
-#if !defined(__cplusplus)
-# include <stdbool.h>
-#endif
-
-#include <libmemcached-1.0/visibility.h>
-#include <libmemcached-1.0/error.h>
-
-#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
index 58aed623339ff0ecd0fc66fd541012d94208e025..33d00fe9a4407b033b28c6cc0f9bf769ab76dfa8 100644 (file)
@@ -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}
index 6130ccc16eceb7c5f5f0e7d348041a776c12e450..bf1bcc1c00966654aaf9c3a2c0ff3c28e2a1f6e2 100644 (file)
@@ -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
 #
 #   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"])
     ])
 
index 135cb976dcc7436022e76af2307d8205847e15f2..a612d70790bc748c4d45de37071b39680d68934b 100644 (file)
@@ -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/rpm.am b/rpm.am
deleted file mode 100644 (file)
index 16a68c1..0000000
--- 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 (file)
index 0000000..16a68c1
--- /dev/null
@@ -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
index 32df0da0883e74ec4813035f3dc758d1b06b3923..e18037df3aaabea03f8deae88dc73ea9850ecbe8 100644 (file)
@@ -43,7 +43,7 @@
 #include <libtest/test.hpp>
 
 using namespace libtest;
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 static test_return_t server_startup_single_TEST(void *obj)
 {
index aad0961b6be99211394239101f95a4093c6ccbab..9b246b176d7ec8860c7e2e9fb8a90721d65b86c0 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <libtest/test.hpp>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include <cstdio>
 #include <cstdlib>
index 2c6cf8ee5e3cc2c94849870e62cd2e0d70aabe68..392c67782d71ccfe086c8e4d79c1860c413c61c5 100644 (file)
@@ -38,8 +38,8 @@
 #include <config.h>
 #include <libtest/test.hpp>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/is.h>
+#include <libmemcached-1.0/memcached.h>
+#include "libmemcached/is.h"
 
 #include "tests/basic.h"
 
index 52ac9b250ceae95732c4c4f3cf64a3cd657b1db1..6808089ae351e9aa7361e3cbc51e11d876d2e15a 100644 (file)
@@ -42,7 +42,7 @@
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include <tests/debug.h>
 #include <tests/print.h>
 
index d7ebdb0543371d2934b2ffabe1932abeb7e7a790..c5096ff7b6e8dcb6a490787a3db4a09aedba21bd 100644 (file)
@@ -38,7 +38,7 @@
 #include <config.h>
 #include <libtest/test.hpp>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include <tests/deprecated.h>
 
 test_return_t server_list_null_test(memcached_st *ptr)
index ee6100fe0bd99c73bff4fde681acd10fbdd199ad..27583ead3f083f1ae3876d4bd6d1756f89c0e5ff 100644 (file)
@@ -42,7 +42,7 @@
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
index b9302f5a9f0a84feecc33077973f90ead7a4c81f..8d3e0dbc1ab58c7012f8827112cdda31e590cba0 100644 (file)
@@ -39,7 +39,7 @@
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 #include "tests/libmemcached-1.0/encoding_key.h"
 
index 66e7c44e02534b085c368791647c2cca6b005aa1..b5a05c77f47e8b23693a48b1c407c99ca1ac8f3a 100644 (file)
@@ -40,8 +40,8 @@
 
 #define BUILDING_LIBMEMCACHED
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/is.h>
+#include <libmemcached-1.0/memcached.h>
+#include "libmemcached/is.h"
 
 #include <tests/error_conditions.h>
 
index 045ae074ef69559cee40b148dd040e6749e91ee8..de8ac905c85fae982add126fb5a536c98862bc2d 100644 (file)
 #include <config.h>
 #include <libtest/test.hpp>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/server_instance.h>
-#include <libmemcached/continuum.hpp>
-#include <libmemcached/instance.h>
+#include <libmemcached-1.0/memcached.h>
+
+#include "libmemcached/server_instance.h"
+#include "libmemcached/continuum.hpp"
+#include "libmemcached/instance.h"
 
 #include <tests/ketama.h>
 #include <tests/ketama_test_cases.h>
index 10b8468359cff8cfe88f59a04e6220e9c06dfc06..75b2ba9062d637ebb2e3dc3ea0a28dbdffc94b85 100644 (file)
@@ -76,7 +76,7 @@
 
 using namespace libtest;
 
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 #include "tests/hash_results.h"
 
index 57ecc60667d0f3e2273cad75b1f648184c7eddf2..cbe4d1b81754e3723a5d30d6476d7c2f077947e9 100644 (file)
@@ -40,7 +40,7 @@
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include <tests/namespace.h>
 
index f506a8f1ba2a11d2d21200b1d705ae114d959917..6a75a2dc711ea8033ebe486bd43a099d804b67fa 100644 (file)
@@ -44,8 +44,8 @@ using namespace libtest;
 #include <string>
 #include <cerrno>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 #include <tests/libmemcached-1.0/parser.h>
 #include <tests/print.h>
index f1c03d07eec33dd08c76b1d18938407329bfec7e..11125493f74a600d82200a020c3dfc209466b3ad 100644 (file)
@@ -43,7 +43,7 @@ using namespace libtest;
 
 #include <iostream>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include "tests/print.h"
 
index 198b83cccdbbf7a32ccab4fb1f77e6a764c5ea9c..2e1808ea8acaf515a6fe420f8cd7d6bf8560684b 100644 (file)
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/server_instance.h>
+#include <libmemcached-1.0/memcached.h>
+
+#include "libmemcached/server_instance.h"
+
 #include <tests/replication.h>
 #include <tests/debug.h>
 
index 6dae42378177a941b55260a886495a65d00415ec..65ce031022bb4aff5e8bb41d80747b32ae02b5e4 100644 (file)
@@ -43,7 +43,7 @@ using namespace libtest;
   Test cases
 */
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 static test_return_t pre_sasl(memcached_st *)
 {
index b343bf9c706e540b90f728f3f7912c6dbd593756..8fd717c6a02852aee79a77c670768a5cf9dc9cd4 100644 (file)
@@ -40,7 +40,7 @@
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include <tests/server_add.h>
 
index 4e5c06163a41eaaee54162f571ecbac17ea63cd1..ad2126fab1548d948be5728eecc6c1e24255138d 100644 (file)
@@ -38,7 +38,7 @@
 #include <config.h>
 #include <libtest/test.hpp>
 
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 #include "tests/print.h"
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
index 5a16495efba540b0b4a69698506ac67fed42b637..605c8baace1c01c1ef40364870bc7c4303dcec9a 100644 (file)
@@ -42,7 +42,7 @@
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
index bb90e94b974adce3feacdb45ec7f6d295291c396..babe1bf2ce7eb4fa99f62533e0d4578ef731acbc 100644 (file)
 
 #include <config.h>
 
-#include <libmemcached/memcached.h>
-#include <libmemcached/string.hpp>
-#include <libmemcached/is.h>
+#include <libmemcached-1.0/memcached.h>
+
+#include "libmemcached/string.hpp"
+#include "libmemcached/is.h"
 
 #include <libtest/test.hpp>
 
index 82195e80fa18bad6c5dd0f5f52f289be43d3988e..5ed812fadb35cdca88b47c177e0466d995c2120a 100644 (file)
@@ -42,7 +42,7 @@ using namespace libtest;
 
 #include <tests/virtual_buckets.h>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 #include <cstring>
 
index 93ad1860bdc986bce7aee4e170ba6a5c1ebf3388..09b47efabaddc2a53e33e83f76f69607cb18cec4 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index d86213c03a43b6ee2af9e0cc778493f372f22481..ed606d1dfbb4e8e234a0f71d04bd52fb2724e05b 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 04c47f80956a014ccfa640c46fc87dd9f356a557..3c8d6b0238289243397322f36d021f2e4aba32ee 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 6f9330a536e0d46a2fbd6953eb424ee7ec90e59a..840c1a17fd63d6e078d7db1b4c576d702e866b89 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 76cc96c434570134387a79d112b478a2b8164064..9b3ddd353ab9236d9097e8c12a700e6c10b9d35a 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index e3a57c5c5970d48bf99118dbb0d9e05138075d12..47496a645d5b8209617a8ab59db10604c86c7cd6 100644 (file)
@@ -42,8 +42,8 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;
 
index 3ba91459c3ab8fc696ed141c48a45fc63a35859a..0f708a9b01eed62089c130ac777881e84669f6cd 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 58da088c5d395cde9d662aba88b0feb3717d4581..1f5f722ac8faf034044ddacb873d7f305225dbcc 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index c150082978a0ce971d87372a182748603b7188c2..792d15fbcfb9b0de5cb46a73e7b659b019ab0c0c 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 9b8cb836a380593ab9f266c35752dfac18b55f1f..b2dea7e9b54e73ea1a5e574c2006cb2e541e78c7 100644 (file)
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
index 48cadcf232dde0d970bd0537ab71d1cec5965834..207ac1dc5c45ba71471ad726b4b3be006caa8146 100644 (file)
@@ -42,8 +42,8 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/util.h>
 
 using namespace libtest;