fix includes
authorMichael Wallner <mike@php.net>
Tue, 18 Feb 2020 12:32:10 +0000 (13:32 +0100)
committerMichael Wallner <mike@php.net>
Tue, 18 Feb 2020 12:33:17 +0000 (13:33 +0100)
241 files changed:
CMake/InstallPublicHeaders.cmake [new file with mode: 0644]
CMake/_Include.cmake
CMakeLists.txt
include/libhashkit-1.0/CMakeLists.txt
include/libmemcached-1.0/CMakeLists.txt
include/libmemcached-1.0/analyze.h
include/libmemcached-1.0/memcached.h
include/libmemcached-1.0/memcached.hpp
include/libmemcached-1.0/result.h
include/libmemcached-1.0/sasl.h
include/libmemcached-1.0/server.h
include/libmemcached-1.0/stats.h
include/libmemcached-1.0/struct/CMakeLists.txt [new file with mode: 0644]
include/libmemcached-1.0/t/c_sasl_test.c
include/libmemcached-1.0/t/c_test.c
include/libmemcached-1.0/t/cc_test.cc
include/libmemcached-1.0/types/CMakeLists.txt [new file with mode: 0644]
include/libmemcachedprotocol-0.0/binary.h
include/libmemcachedprotocol-0.0/handler.h
include/libmemcachedutil-1.0/CMakeLists.txt
include/libmemcachedutil-1.0/pool.h
include/libmemcachedutil-1.0/util.h
src/bin/execute.cc
src/bin/execute.h
src/bin/generator.cc
src/bin/memcapable.cc
src/bin/memcat.cc
src/bin/memcp.cc
src/bin/memdump.cc
src/bin/memerror.cc
src/bin/memexist.cc
src/bin/memflush.cc
src/bin/memparse.cc
src/bin/memping.cc
src/bin/memrm.cc
src/bin/memslap.cc
src/bin/memstat.cc
src/bin/memtouch.cc
src/bin/ms_conn.h
src/bin/ms_setting.c
src/bin/utilities.cc
src/bin/utilities.h
src/libhashkit/CMakeLists.txt
src/libhashkit/behavior.cc
src/libhashkit/common.h
src/libhashkit/crc32.cc
src/libhashkit/digest.cc
src/libhashkit/encrypt.cc
src/libhashkit/fnv_32.cc
src/libhashkit/fnv_64.cc
src/libhashkit/function.cc
src/libhashkit/has.cc
src/libhashkit/hashkit.cc
src/libhashkit/hashkit.h
src/libhashkit/hsieh.cc
src/libhashkit/jenkins.cc
src/libhashkit/ketama.cc
src/libhashkit/md5.cc
src/libhashkit/murmur.cc
src/libhashkit/nohsieh.cc
src/libhashkit/one_at_a_time.cc
src/libhashkit/str_algorithm.cc
src/libhashkit/strerror.cc
src/libhashkit/string.cc
src/libmemcached/CMakeLists.txt
src/libmemcached/allocators.cc
src/libmemcached/analyze.cc
src/libmemcached/array.c
src/libmemcached/assert.hpp
src/libmemcached/auto.cc
src/libmemcached/behavior.cc
src/libmemcached/callback.cc
src/libmemcached/common.h
src/libmemcached/connect.cc
src/libmemcached/csl/common.h
src/libmemcached/csl/context.cc
src/libmemcached/csl/parser.yy
src/libmemcached/csl/scanner.l
src/libmemcached/csl/symbol.h
src/libmemcached/delete.cc
src/libmemcached/do.cc
src/libmemcached/dump.cc
src/libmemcached/encoding_key.cc
src/libmemcached/error.cc
src/libmemcached/exist.cc
src/libmemcached/fetch.cc
src/libmemcached/flag.cc
src/libmemcached/flush.cc
src/libmemcached/flush_buffers.cc
src/libmemcached/get.cc
src/libmemcached/hash.cc
src/libmemcached/hosts.cc
src/libmemcached/initialize_query.cc
src/libmemcached/instance.cc
src/libmemcached/io.cc
src/libmemcached/key.cc
src/libmemcached/memcached.cc
src/libmemcached/memcached.h
src/libmemcached/memcached.hpp
src/libmemcached/memcached/README.txt [deleted file]
src/libmemcached/memcached/protocol_binary.h [deleted file]
src/libmemcached/memcached/vbucket.h [deleted file]
src/libmemcached/memory.h
src/libmemcached/options.cc
src/libmemcached/parse.cc
src/libmemcached/purge.cc
src/libmemcached/quit.cc
src/libmemcached/response.cc
src/libmemcached/result.cc
src/libmemcached/server.cc
src/libmemcached/server_list.cc
src/libmemcached/stats.cc
src/libmemcached/storage.cc
src/libmemcached/strerror.cc
src/libmemcached/string.cc
src/libmemcached/touch.cc
src/libmemcached/udp.cc
src/libmemcached/util.h
src/libmemcached/util/Makefile.am [deleted file]
src/libmemcached/verbosity.cc
src/libmemcached/version.cc
src/libmemcached/virtual_bucket.c
src/libmemcachedprotocol/ascii_handler.c
src/libmemcachedprotocol/binary_handler.c
src/libmemcachedprotocol/cache.c
src/libmemcachedprotocol/common.h
src/libmemcachedprotocol/handler.c
src/libmemcachedprotocol/pedantic.c
src/libmemcachedutil/flush.cc
src/libmemcachedutil/pid.cc
src/libmemcachedutil/ping.cc
src/libmemcachedutil/pool.cc
src/libmemcachedutil/version.cc
src/libtest/alarm.cc
src/libtest/blobslap_worker.cc
src/libtest/client.cc
src/libtest/collection.cc
src/libtest/collection.h
src/libtest/common.h
src/libtest/comparison.cc
src/libtest/comparison.hpp
src/libtest/core.cc
src/libtest/core_count.cc
src/libtest/cpu.cc
src/libtest/dns.cc
src/libtest/dream.cc
src/libtest/drizzled.cc
src/libtest/exception.cc
src/libtest/exception/fatal.cc
src/libtest/failed.cc
src/libtest/formatter.cc
src/libtest/framework.cc
src/libtest/framework.h
src/libtest/gearmand.cc
src/libtest/has.cc
src/libtest/http.cc
src/libtest/http.hpp
src/libtest/is_local.cc
src/libtest/killpid.cc
src/libtest/libtool.cc
src/libtest/lite.h
src/libtest/main.cc
src/libtest/memcached.cc
src/libtest/port.cc
src/libtest/result.cc
src/libtest/result.hpp
src/libtest/runner.cc
src/libtest/server.cc
src/libtest/server.h
src/libtest/signal.cc
src/libtest/skiptest.cc
src/libtest/socket.cc
src/libtest/strerror.cc
src/libtest/test.h
src/libtest/test.hpp
src/libtest/timer.cc
src/libtest/tmpfile.cc
src/libtest/tmpfile.hpp
src/libtest/unittest.cc
src/libtest/vchar.cc
src/libtest/wait.cc
src/libtest/wait.h
src/libtest/yatl.h
src/util/daemon.cc
src/util/operation.cc
src/util/signal.cc
support/libmemcached.pc.in
tests/basic.h
tests/cpp_example.cc
tests/cycle.cc
tests/failure.cc
tests/hash_plus.cc
tests/hashkit_functions.cc
tests/libmemcached-1.0/all_tests.cc
tests/libmemcached-1.0/all_tests_socket.cc
tests/libmemcached-1.0/atomsmasher.cc
tests/libmemcached-1.0/basic.cc
tests/libmemcached-1.0/callback_counter.cc
tests/libmemcached-1.0/callbacks.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/exist.cc
tests/libmemcached-1.0/fetch_all_results.cc
tests/libmemcached-1.0/generate.cc
tests/libmemcached-1.0/haldenbrand.cc
tests/libmemcached-1.0/internals.cc
tests/libmemcached-1.0/ketama.cc
tests/libmemcached-1.0/mem_functions.cc
tests/libmemcached-1.0/memcached_fetch_execute.cc
tests/libmemcached-1.0/memcached_get.cc
tests/libmemcached-1.0/namespace.cc
tests/libmemcached-1.0/parser.cc
tests/libmemcached-1.0/plus.cpp
tests/libmemcached-1.0/pool.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/touch.cc
tests/libmemcached-1.0/virtual_buckets.cc
tests/mem_udp.cc
tests/memcapable.cc
tests/memcat.cc
tests/memcp.cc
tests/memdump.cc
tests/memerror.cc
tests/memexist.cc
tests/memflush.cc
tests/memping.cc
tests/memrm.cc
tests/memslap.cc
tests/memstat.cc
tests/memtouch.cc
tests/parser.am [deleted file]
tests/parser.cc

diff --git a/CMake/InstallPublicHeaders.cmake b/CMake/InstallPublicHeaders.cmake
new file mode 100644 (file)
index 0000000..56ebb0c
--- /dev/null
@@ -0,0 +1,13 @@
+function(install_public_headers DIRECTORY)
+    foreach(HEADER IN LISTS ARGN)
+        file(READ ${HEADER} HEADER_IN)
+        string(REGEX REPLACE "include *\"([^\"]+)\"" "include <\\1>" HEADER_OUT "${HEADER_IN}")
+        file(GENERATE
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
+                CONTENT "${HEADER_OUT}"
+                )
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}
+                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${DIRECTORY}
+                )
+    endforeach()
+endfunction()
index 9e73358ab354a0dd8d7cb4a4eb71cf9911893a2f..1c5b89ffab55ed7f32aea92f15c32cf08c5a39e2 100644 (file)
@@ -10,6 +10,7 @@ find_package(PkgConfig)
 find_package(Threads REQUIRED)
 
 # locals
+include(InstallPublicHeaders)
 include(SafeString)
 include(CheckDebug)
 include(CheckDecl)
index 36ca49888eee470476afaa34c9419cfd0b09aa2b..7cd6745f29a89dadf49c4a1baeae26eb7d47daca 100644 (file)
@@ -24,6 +24,7 @@ foreach(INCLUDE IN ITEMS ${CMAKE_BINARY_DIR} .)
             ${INCLUDE}/src
             )
 endforeach()
+
 set(AUTOHEADER_FILE mem_config.h)
 
 set(CLIENTS
index ee967319122204c5ca2477f51bc985c887c5fc74..bb97fb30fff28c9a82ed56c411771cf1012f1cf0 100644 (file)
@@ -1,7 +1,20 @@
 
 configure_file(configure.h.in configure.h @ONLY)
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING REGEX "\\.h(pp)?$"
+install_public_headers(
+        libhashkit-1.0
+
+        algorithm.h
+        basic_string.h
+        behavior.h
+        digest.h
+        function.h
+        has.h
+        hashkit.h
+        hashkit.hpp
+        str_algorithm.h
+        strerror.h
+        string.h
+        types.h
+        visibility.h
         )
index 061c6f7fd374030bc17142ee47ec1e117a45141e..f288c13ef7ab06d4bf4bca00dda53268e4ad4f73 100644 (file)
@@ -1,8 +1,52 @@
 
 configure_file(configure.h.in configure.h @ONLY)
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING REGEX "\\.h(pp)?$"
-        PATTERN t EXCLUDE
+add_subdirectory(struct)
+add_subdirectory(types)
+
+install_public_headers(
+        libmemcached-1.0
+
+        alloc.h
+        allocators.h
+        analyze.h
+        auto.h
+        basic_string.h
+        behavior.h
+        callback.h
+        callbacks.h
+        defaults.h
+        delete.h
+        deprecated_types.h
+        dump.h
+        encoding_key.h
+        error.h
+        exception.hpp
+        exist.h
+        fetch.h
+        flush_buffers.h
+        flush.h
+        get.h
+        hash.h
+        limits.h
+        memcached.h
+        memcached.hpp
+        options.h
+        parse.h
+        platform.h
+        quit.h
+        result.h
+        return.h
+        sasl.h
+        server.h
+        server_list.h
+        stats.h
+        storage.h
+        strerror.h
+        touch.h
+        triggers.h
+        types.h
+        verbosity.h
+        version.h
+        visibility.h
         )
index 0da38143bf97ae96732e9b419aaabcd502d2b9b7..33cd6ee972c1f0d5bdb48b6cf672fadffb74ca47 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached-1.0/struct/analysis.h>
+#include "libmemcached-1.0/struct/analysis.h"
 
 #pragma once
 
index 1ee54bbe03613e8b07945fc5000c02f2df480ecc..5a7f870e39777a020cd761fb78376844d2d929e1 100644 (file)
 
 #include <sys/types.h>
 
-#include <libmemcached-1.0/visibility.h>
-#include <libmemcached-1.0/configure.h>
-#include <libmemcached-1.0/platform.h>
-
-#include <libmemcached-1.0/limits.h>
-#include <libmemcached-1.0/defaults.h>
-
-#include <libmemcached-1.0/types/behavior.h>
-#include <libmemcached-1.0/types/callback.h>
-#include <libmemcached-1.0/types/connection.h>
-#include <libmemcached-1.0/types/hash.h>
-#include <libmemcached-1.0/types/return.h>
-#include <libmemcached-1.0/types/server_distribution.h>
-
-#include <libmemcached-1.0/return.h>
-
-#include <libmemcached-1.0/types.h>
-#include <libmemcached-1.0/callbacks.h>
-#include <libmemcached-1.0/alloc.h>
-#include <libmemcached-1.0/triggers.h>
-
-#include <libhashkit-1.0/hashkit.h>
-
-#include <libmemcached-1.0/struct/callback.h>
-#include <libmemcached-1.0/struct/string.h>
-#include <libmemcached-1.0/struct/result.h>
-#include <libmemcached-1.0/struct/allocator.h>
-#include <libmemcached-1.0/struct/sasl.h>
-#include <libmemcached-1.0/struct/memcached.h>
-#include <libmemcached-1.0/struct/server.h>
-#include <libmemcached-1.0/struct/stat.h>
-
-#include <libmemcached-1.0/basic_string.h>
-#include <libmemcached-1.0/error.h>
-#include <libmemcached-1.0/stats.h>
+#include "libmemcached-1.0/visibility.h"
+#include "libmemcached-1.0/configure.h"
+#include "libmemcached-1.0/platform.h"
+
+#include "libmemcached-1.0/limits.h"
+#include "libmemcached-1.0/defaults.h"
+
+#include "libmemcached-1.0/types/behavior.h"
+#include "libmemcached-1.0/types/callback.h"
+#include "libmemcached-1.0/types/connection.h"
+#include "libmemcached-1.0/types/hash.h"
+#include "libmemcached-1.0/types/return.h"
+#include "libmemcached-1.0/types/server_distribution.h"
+
+#include "libmemcached-1.0/return.h"
+
+#include "libmemcached-1.0/types.h"
+#include "libmemcached-1.0/callbacks.h"
+#include "libmemcached-1.0/alloc.h"
+#include "libmemcached-1.0/triggers.h"
+
+#include "libhashkit-1.0/hashkit.h"
+
+#include "libmemcached-1.0/struct/callback.h"
+#include "libmemcached-1.0/struct/string.h"
+#include "libmemcached-1.0/struct/result.h"
+#include "libmemcached-1.0/struct/allocator.h"
+#include "libmemcached-1.0/struct/sasl.h"
+#include "libmemcached-1.0/struct/memcached.h"
+#include "libmemcached-1.0/struct/server.h"
+#include "libmemcached-1.0/struct/stat.h"
+
+#include "libmemcached-1.0/basic_string.h"
+#include "libmemcached-1.0/error.h"
+#include "libmemcached-1.0/stats.h"
 
 // Everything above this line must be in the order specified.
-#include <libmemcached-1.0/allocators.h>
-#include <libmemcached-1.0/analyze.h>
-#include <libmemcached-1.0/auto.h>
-#include <libmemcached-1.0/behavior.h>
-#include <libmemcached-1.0/callback.h>
-#include <libmemcached-1.0/delete.h>
-#include <libmemcached-1.0/dump.h>
-#include <libmemcached-1.0/encoding_key.h>
-#include <libmemcached-1.0/exist.h>
-#include <libmemcached-1.0/fetch.h>
-#include <libmemcached-1.0/flush.h>
-#include <libmemcached-1.0/flush_buffers.h>
-#include <libmemcached-1.0/get.h>
-#include <libmemcached-1.0/hash.h>
-#include <libmemcached-1.0/options.h>
-#include <libmemcached-1.0/parse.h>
-#include <libmemcached-1.0/quit.h>
-#include <libmemcached-1.0/result.h>
-#include <libmemcached-1.0/server.h>
-#include <libmemcached-1.0/server_list.h>
-#include <libmemcached-1.0/storage.h>
-#include <libmemcached-1.0/strerror.h>
-#include <libmemcached-1.0/touch.h>
-#include <libmemcached-1.0/verbosity.h>
-#include <libmemcached-1.0/version.h>
-#include <libmemcached-1.0/sasl.h>
-
-#include <libmemcached-1.0/deprecated_types.h>
+#include "libmemcached-1.0/allocators.h"
+#include "libmemcached-1.0/analyze.h"
+#include "libmemcached-1.0/auto.h"
+#include "libmemcached-1.0/behavior.h"
+#include "libmemcached-1.0/callback.h"
+#include "libmemcached-1.0/delete.h"
+#include "libmemcached-1.0/dump.h"
+#include "libmemcached-1.0/encoding_key.h"
+#include "libmemcached-1.0/exist.h"
+#include "libmemcached-1.0/fetch.h"
+#include "libmemcached-1.0/flush.h"
+#include "libmemcached-1.0/flush_buffers.h"
+#include "libmemcached-1.0/get.h"
+#include "libmemcached-1.0/hash.h"
+#include "libmemcached-1.0/options.h"
+#include "libmemcached-1.0/parse.h"
+#include "libmemcached-1.0/quit.h"
+#include "libmemcached-1.0/result.h"
+#include "libmemcached-1.0/server.h"
+#include "libmemcached-1.0/server_list.h"
+#include "libmemcached-1.0/storage.h"
+#include "libmemcached-1.0/strerror.h"
+#include "libmemcached-1.0/touch.h"
+#include "libmemcached-1.0/verbosity.h"
+#include "libmemcached-1.0/version.h"
+#include "libmemcached-1.0/sasl.h"
+
+#include "libmemcached-1.0/deprecated_types.h"
 
 #ifdef __cplusplus
 extern "C" {
index af12f30010608f0699255166199b7e36824a4140..aa25040c43ecb4b5a41de566807848fa7e1549cb 100644 (file)
@@ -50,9 +50,9 @@
 
 #pragma once
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #if 0
-#include <libmemcached/exception.hpp>
+#include "libmemcached/exception.hpp"
 #endif
 
 #include <string.h>
index 615957f3906420cbb204168b00ca6387b74d9be0..f07e1e75e24f626cf7a368fe08135efc579da979 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached-1.0/struct/result.h>
+#include "libmemcached-1.0/struct/result.h"
 
 #pragma once
 
index c3084217effdd79907e845a1e5112909a28b5e63..7d88f7bce75d40148ecce45d4ed3b4bfdaf74dbe 100644 (file)
@@ -67,4 +67,4 @@ sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr);
 }
 #endif
 
-#include <libmemcached-1.0/struct/sasl.h>
+#include "libmemcached-1.0/struct/sasl.h"
index abd0bfb95375d5a4152998195cef227758fe6c3e..8554804a7ce1053938467929205de672d9b0d8a6 100644 (file)
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include <libmemcached-1.0/struct/server.h>
+#include "libmemcached-1.0/struct/server.h"
 
 #ifdef __cplusplus
 extern "C" {
index 708064f1b505e91feec8c0ee0cd001fdfd793064..5c384233ef5b3c889afb8ea616574bf0080dbef5 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached-1.0/struct/stat.h>
+#include "libmemcached-1.0/struct/stat.h"
 
 #pragma once
 
diff --git a/include/libmemcached-1.0/struct/CMakeLists.txt b/include/libmemcached-1.0/struct/CMakeLists.txt
new file mode 100644 (file)
index 0000000..548f993
--- /dev/null
@@ -0,0 +1,14 @@
+
+install_public_headers(
+        libmemcached-1.0/struct
+
+        allocator.h
+        analysis.h
+        callback.h
+        memcached.h
+        result.h
+        sasl.h
+        server.h
+        stat.h
+        string.h
+)
index 93f729d122f219f93247de3ce6d8aa748d4b6b9c..0f52afffb0457b8e73fd25b35cebf047d8ccbec2 100644 (file)
@@ -44,7 +44,7 @@
 #include <sasl/sasl.h>
 #endif
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 int main(void)
 {
index 40935fac52991058eb83288228640d273a648b28..af25f1d069fbe8b3856d087c7f6f84e698e5beae 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 int main(void)
 {
index 71ee8c30131e258f8cb69a224769c0d04a7c8a18..c098e4022ed7418c923462f1337878b5c3a545f9 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <cstdlib>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 int main(void)
 {
diff --git a/include/libmemcached-1.0/types/CMakeLists.txt b/include/libmemcached-1.0/types/CMakeLists.txt
new file mode 100644 (file)
index 0000000..14ec107
--- /dev/null
@@ -0,0 +1,11 @@
+
+install_public_headers(
+        libmemcached-1.0/types
+
+        behavior.h
+        callback.h
+        connection.h
+        hash.h
+        return.h
+        server_distribution.h
+        )
index 51e2c42294848beca127ca16a64f120d55a741cc..50e092e109bd6b70c0810fe7f16a68e0c090f832 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef PROTOCOL_BINARY_H
 #define PROTOCOL_BINARY_H
 
-#include <libmemcachedprotocol-0.0/vbucket.h>
+#include "libmemcachedprotocol-0.0/vbucket.h"
 
 /**
  * \addtogroup Protocol
index 113338dfb675a987a039d4211d27eaf421d94e63..7a0b79eafbeed3082a2cec4e77eb470c1d243386 100644 (file)
 # include <stdbool.h>
 #endif
 
-#include <libmemcached-1.0/visibility.h>
-#include <libmemcached-1.0/platform.h>
-#include <libmemcachedprotocol-0.0/binary.h>
-#include <libmemcachedprotocol-0.0/callback.h>
+#include "libmemcached-1.0/visibility.h"
+#include "libmemcached-1.0/platform.h"
+#include "libmemcachedprotocol-0.0/binary.h"
+#include "libmemcachedprotocol-0.0/callback.h"
 
 /* Forward declarations */
 /*
index c61388753c8b5d96f0df7b736339d0a057d00551..a6e353d1fd58178be5fd6a66f8c3a044d4a3e59d 100644 (file)
@@ -1,5 +1,12 @@
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING REGEX "\\.h(pp)?$"
+install_public_headers(
+        libmemcachedutil-1.0
+
+        flush.h
+        ostream.hpp
+        pid.h
+        ping.h
+        pool.h
+        util.h
+        version.h
         )
index a11117ca7ce83af1e73a6c946f1eca5ed8dbb1d7..8f7afe02019caee7045a1af22d5904fe59961d62 100644 (file)
@@ -38,7 +38,7 @@
 #pragma once
 
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #ifdef __cplusplus
 extern "C" {
index d3620988e23dfc01542999e4416da16b68e698bb..2e9e86e5f2a17c3a9d738f4af6f317b5228978ba 100644 (file)
 
 #pragma once
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
-#include <libmemcachedutil-1.0/pid.h>
-#include <libmemcachedutil-1.0/flush.h>
-#include <libmemcachedutil-1.0/ping.h>
-#include <libmemcachedutil-1.0/pool.h>
-#include <libmemcachedutil-1.0/version.h>
+#include "libmemcachedutil-1.0/pid.h"
+#include "libmemcachedutil-1.0/flush.h"
+#include "libmemcachedutil-1.0/ping.h"
+#include "libmemcachedutil-1.0/pool.h"
+#include "libmemcachedutil-1.0/version.h"
index 37148404103d866c772a747e6905a9c0d2c1e65c..f0a5e47e40e88dc86c594323f1116c25d149dd22 100644 (file)
@@ -15,7 +15,7 @@
   Return the number of rows set.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 #include "execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
index e66b0c5a928c095c9da788720a07e5925b59e400..c044c669cabc219abb985e4b906e4a90e81eb096 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "generator.h"
 
 #ifdef __cplusplus
index e418fd7e49e583694bd1501b8bd8b9b4b45b7f59..3de895d0e2b64bc254d84b66430eb7553357e9be 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <stdint.h>
 
index 81e619f647d1c63578993de370c077e4a633101b..f735c2a5979a7c73a645dac2ae77a613a162d242 100644 (file)
@@ -13,7 +13,7 @@
 /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 #undef NDEBUG
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "libmemcached/socket.hpp"
 #include "libmemcachedprotocol-0.0/binary.h"
index 86535123789679c1c068654e1beb33e6546e45c8..269d1c1bab0cfbcd08d773c0c6265aab11849dc8 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
 #include <getopt.h>
 #include <iostream>
 #include <unistd.h>
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "utilities.h"
 
index d87e0cad0cb4bc1486ab60b9ef23a9f9b4f1bdc8..cf8d273c98d4f7893ff95b9082b0a571fffd43f8 100644 (file)
@@ -31,7 +31,7 @@
 #include <unistd.h>
 
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "client_options.h"
 #include "utilities.h"
index 48c35d3edf4e0b81e2419913bf32bf02a2d41d20..8e12066ba20e6103147d9732133bdd96d707dac5 100644 (file)
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "client_options.h"
 #include "utilities.h"
index 3cee64cce518aaf3b6ca19bb64ac0b399ad6bd55..96c068f56ab1246f99baaa4f0b879337e814ed15 100644 (file)
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "utilities.h"
 
index 505f5385d2ab8d38d1160ff8faf3954f315561df..d08492eebfd6f7291ec9609085beb801d20ad54f 100644 (file)
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "client_options.h"
 #include "utilities.h"
 
index 71545eabb43d13c04b1ee0658a181e515bc41fee..8cd933ff132da914db2755cbad02c88de895350b 100644 (file)
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "client_options.h"
 #include "utilities.h"
 
index fc2cb0c722cedc1ff671dc5474b660764a56eae4..341f51456db7afaec5819811c33a1ec5f9748a1e 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
 #include <iostream>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 int main(int argc, char *argv[])
 {
index 180d6a2108eee67450c42401cfd61cf9355432a9..f7962ae08d7c12e05c578dab578cf6dc0c40dbb4 100644 (file)
@@ -17,8 +17,8 @@
 #include <getopt.h>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 #include "client_options.h"
 #include "utilities.h"
 
index 50ead7a380679a09b61746849c9a6f642cf510cd..fc6df6c0714786dd71922119407149f7f451fc88 100644 (file)
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "client_options.h"
 #include "utilities.h"
 
index 9bc4f2385683583960aa12348c11ecf1633a224f..8964976470795bd0cc7f3e268138bd79eb06948d 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cassert>
 #include <cerrno>
@@ -55,7 +55,7 @@
 
 #include <iostream>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "client_options.h"
 #include "utilities.h"
index e5bac9165a26d171734b690589a110d334c17129..6021dbc553892d4dca37be5fa824cf57c03f7482 100644 (file)
@@ -12,7 +12,7 @@
  *          Brian Aker
  *          Toru Maesaka
  */
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "client_options.h"
 #include "utilities.h"
index 09e0c92a2074fb87479960f81d44d1d25f4b48ac..b52ce9bd9c6435f1f89619b797cfbd4763830660 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cerrno>
 #include <cstdio>
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "utilities.h"
 
index 943965ca3c85b89965925993aba46d7a719bc856..d0530a7ccb5da268ae6c22a0b9bc94e94cf617bc 100644 (file)
@@ -17,7 +17,7 @@
 #include <netdb.h>
 
 #include "ms_task.h"
-#include <libmemcachedprotocol-0.0/binary.h>
+#include "libmemcachedprotocol-0.0/binary.h"
 
 #ifdef __cplusplus
 extern "C" {
index eafe459a523059b1c819921d94e75ab511e8a4c2..6cb367a3bef2a1e6d1c7bfeadee93d6bb6f2e2d5 100644 (file)
@@ -11,7 +11,7 @@
 
 #include "mem_config.h"
 
-#include <libmemcached/memcached.h>
+#include "libmemcached/memcached.h"
 
 #include <ctype.h>
 #include <inttypes.h>
index fe8f501c7bb73b89a7a5597999f6052166db6d45..c1f34b8e182247c6e639852c1df571af5cc8b795 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include "utilities.h"
 
index e275fa853443aeebecba03550f7e24d3d68b4438..149bd1f4f152196ddd2b532f7e643fa06dd9d236 100644 (file)
@@ -12,7 +12,7 @@
 #pragma once
 
 #include <getopt.h>
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "client_options.h"
 
 #if defined(HAVE_SYS_TIME_H)
index 08c4835101bb242612659c70cc70cb68f7dfa56b..6decd186a1e5d7870a92322d43df8f2e1ecbc567 100644 (file)
@@ -23,7 +23,6 @@ add_library(libhashkit SHARED
         murmur.cc
         murmur3.cc
         murmur3_api.cc
-        nohsieh.cc
         one_at_a_time.cc
         rijndael.cc
         str_algorithm.cc
@@ -41,7 +40,9 @@ install(TARGETS libhashkit EXPORT libhashkit
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 export(EXPORT libhashkit)
 install(EXPORT libhashkit DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING PATTERN hashkit.h
+
+install_public_headers(
+        libhashkit
+
+        hashkit.h
         )
index 6c7a9aca0feb902444d0dd52390e7174803ea2bb..04d1bba5ec846e683243737af1818dd91ced1a29 100644 (file)
@@ -35,4 +35,4 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
index d32d31bc3e845350b5bf1ce0bc6d742c1071a805..fd3751a21d908ff77a0854ceda8265da90d0eafd 100644 (file)
@@ -51,7 +51,7 @@
 # endif
 #endif
 
-#include <libhashkit-1.0/hashkit.h>
+#include "libhashkit-1.0/hashkit.h"
 #include "libhashkit/algorithm.h"
 #include "libhashkit/is.h"
 #include "libhashkit/string.h"
index fe9fe711e0c69a858e0e4320c2a03d1aba1c0a64..5938b36305b5d04a29de7399e04a893a6f1073f6 100644 (file)
@@ -40,7 +40,7 @@
  * src/usr.bin/cksum/crc32.c.
  */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 static const uint32_t crc32tab[256] = {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
index 2300293430b4fb8efcaeaf93af20d688f18122b2..3afc2a5f8de50505674c0c06267a1f4bc3419e8e 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 uint32_t hashkit_digest(const hashkit_st *self, const char *key, size_t key_length)
 {
index 95475d7bc8f105fb27be930fee87e8e41e35fe16..7555640e57f2a304c05f967852c4a6b79c164fed 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 hashkit_string_st *hashkit_encrypt(hashkit_st *kit,
                                    const char* source, size_t source_length)
index 52eea80d6d646047fe4db1a0c22113a9c0fa17c0..9d433f002fd42b6026bbb430fb6c3ae7e4849348 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 /* FNV hash'es lifted from Dustin Sallings work */
 static uint32_t FNV_32_INIT= 2166136261UL;
index 68e4dd07ef564084cf87b47a1994b7da41d428e2..85a24f80be954139e8694e8df03160492a17ab76 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)
 
index 3d530ae9b24e0a21829927b512708cb38f8b4cc7..c1eac35865d6d204ad87323ee7270fb52ecc8f75 100644 (file)
@@ -6,7 +6,7 @@
  * the COPYING file in the parent directory for full text.
  */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 static hashkit_return_t _set_function(struct hashkit_st::hashkit_function_st *self, hashkit_hash_algorithm_t hash_algorithm)
 {
index 843e32e41e36f69b6b383af767360150d4794664..93a1204ee62d520148c2f93d4102f98d38d2618c 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo)
 {
index e2528b97bdc0b32c5af39dfe62c0846a9effe9d3..dbfeacc0b4606825011fe24209da95b22547afad 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 static inline void _hashkit_init(hashkit_st *self)
 {
index 692d5915ccc3774bc4412230051d3e67fb8ed199..48c99366498a0fce26546f0e8cd6fe27089e0628 100644 (file)
@@ -37,4 +37,4 @@
 
 #pragma once
 
-#include <libhashkit-1.0/hashkit.h>
+#include "libhashkit-1.0/hashkit.h"
index ca88f8d67ba18443933146c64f7cd0e380429528..43800a49144e278e41caa0ea72a05dca9dbb67d3 100644 (file)
@@ -42,7 +42,7 @@
  * http://www.azillionmonkeys.com/qed/hash.html
 */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__))
index 3c6558a42ad9a21d9980dcb8983056f9dd073e1e..a08287dbc2c85fc206586578322acbdad1e776de 100644 (file)
@@ -48,7 +48,7 @@
 * Add big endian support
 */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #define hashsize(n) ((uint32_t)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
index eaa8442c879050cf4bc0d7909d1783b897f824f2..11e6222b994072f53aaac032ef5d0ae4446dca67 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 #include <math.h>
 
 #if 0
index ef8677666a22dcb3db6cbc7774fd928a6f112b63..d17b6c25cd8811a2446da11de8d107ceee3063ee 100644 (file)
@@ -66,7 +66,7 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
 */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #include <string.h>
 #include <sys/types.h>
index f3e8fe6ac7eebcca2d92d72e69d19e249aed2934..a2ff52163113582b181dd602c8a8e583e2ef894c 100644 (file)
@@ -52,7 +52,7 @@
   Updated to murmur2 hash - BP
 */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #ifdef HAVE_MURMUR_HASH
 
index 8def99396f128d057ac028d4a5215422ce01e461..6b0f767f4f6f0258d9a09c0b6c72eb312aeda0f4 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #ifdef HAVE_HSIEH_HASH
 #error "not supported"
index 647f3c18364d461350dcc578c06c138e60b4b202..bd66c920ec57fe42e5988e9740e5d316b631b386 100644 (file)
@@ -41,7 +41,7 @@
 http://en.wikipedia.org/wiki/Jenkins_hash_function
 */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void *context)
 {
index b84a0bb745e8dd57d08892701f2e74122f29dd68..e5552f649ece699984bf6ea1fcdcf703974cb877 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 const char * libhashkit_string_hash(hashkit_hash_algorithm_t type)
 {
index f67e5c5d05154954b8e6f03729f83e0e97234301..5f905bc4ab2956656242d5940ef33d82e548c71a 100644 (file)
@@ -37,7 +37,7 @@
 
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 const char *hashkit_strerror(hashkit_st *ptr, hashkit_return_t rc)
 {
index 05bbdc58042be1af44febaeb99ade61079ff23a3..e59c1649c5521be089b06bcb3db2f26543994360 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
 
 #include <cassert>
 #include <cstring>
index e39c2f696fbb7226146ad6112229c44278caeec5..e3bcfbe76d8048751a104850e42ced963d2f6d6e 100644 (file)
@@ -77,12 +77,12 @@ install(TARGETS libmemcached EXPORT libmemcached
 export(EXPORT libmemcached)
 install(EXPORT libmemcached DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING REGEX "(memcached|util)\\.h(pp)?"
-        PATTERN csl EXCLUDE
-        PATTERN memcached EXCLUDE
-        PATTERN util EXCLUDE
+install_public_headers(
+        libmemcached
+
+        memcached.h
+        memcached.hpp
+        util.h
         )
 
 # FIXME: dtrace
index f1caf71ec373eab433bd3832d5d010a3218f2b45..2bf5f6d1ddf6720bbb2ce412952410da6072c601 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 void _libmemcached_free(const memcached_st*, void *mem, void*)
 {
index c6ac15c20ef18b01f07faedd8080e54895e6abc7..c7a7475740575a03eb74a17e213ae1a6b28697f3 100644 (file)
@@ -1,4 +1,4 @@
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static void calc_largest_consumption(memcached_analysis_st *result,
                                      const uint32_t server_num,
index cd472c3923e8ccd0973f51017638579279afab60..62c85ece18b6b338e531a3eeeea33ae42df0a748 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 #include <assert.h>
 #include <iso646.h>
 
index cd4a194b2b1ce305e074e5f090ca82abead4d2ee..a1526babe857ae115ea4fd95ced3b28b4343b29c 100644 (file)
@@ -62,7 +62,7 @@
 # include <stdio.h>
 #endif
 
-# include <libmemcached/backtrace.hpp>
+# include "libmemcached/backtrace.hpp"
 
 # define assert_msg(__expr, __mesg) \
 do \
index 06e7ab6419646abb82121ce5d9a775fb5aaeaa07..1d829f681cad27c377e7cde7e8b556076c7e892d 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static void auto_response(memcached_instance_st* instance, const bool reply,  memcached_return_t& rc, uint64_t* value)
 {
index 7536248e214f2db040a83444b5a7276691d3209c..07ad1c46ae2b010ecc318803502abb0bae56ac87 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include <libmemcached/common.h>
-#include <libmemcached/options.hpp>
-#include <libmemcached/virtual_bucket.h>
+#include "libmemcached/common.h"
+#include "libmemcached/options.hpp"
+#include "libmemcached/virtual_bucket.h"
 
 #include <ctime>
 #include <sys/types.h>
index a43eef93065d8716806d4ef2c3af4124f8e75e12..b7cc127b158335e91c0e0a054b9844dbb61e4f22 100644 (file)
@@ -9,7 +9,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 #include <sys/types.h>
 
 #ifndef __INTEL_COMPILER
index 8cedc5214b24f12b92d63e86b2bea7f0ce706850..e62709b27682c154c192c85477f1a223f723a677 100644 (file)
@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #ifdef __cplusplus
 # include <cstddef>
 # include "libmemcached/windows.hpp"
 #endif
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "libmemcached/watchpoint.h"
 #include "libmemcached/is.h"
 typedef struct memcached_st Memcached;
index 1cfe7940037bdf0989d3b8ce7a14bdbea3a63703..4c4b1dffb6b9ebdaecccfec6a35b6d78c98092bf 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #include <cassert>
 
index 60b27d6e3cdbdb7226ed4d6d959ff8a0d52115e7..667ac849fc17d7fdffd4cf4d4ff7dffd101e7840 100644 (file)
@@ -47,6 +47,6 @@
 typedef void* yyscan_t;
 #endif
 
-#include <libmemcached/common.h>
-#include <libmemcached/csl/server.h>
+#include "libmemcached/common.h"
+#include "libmemcached/csl/server.h"
 
index fa2500be61837d13df5ab223f63a6b4c76a356af..1fd252126efed10fe57d74d19c5f8c3a98d0830e 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <libmemcached/csl/common.h>
-#include <libmemcached/csl/context.h>
+#include "libmemcached/csl/common.h"
+#include "libmemcached/csl/context.h"
 
 void Context::abort(const char *error_arg, config_tokentype last_token, const char *last_token_str)
 {
index 87fe4f3b4f9b706cbf429f166fdafd428562b1fd..8d2835a11d1fb207f62af4e4921115f623f1a985 100644 (file)
@@ -36,7 +36,7 @@
 
 %{
 
-#include <libmemcached/csl/common.h>
+#include "libmemcached/csl/common.h"
 
 class Context;
 
@@ -58,11 +58,11 @@ class Context;
 
 %{
 
-#include <libmemcached/options.hpp>
+#include "libmemcached/options.hpp"
 
-#include <libmemcached/csl/context.h>
-#include <libmemcached/csl/symbol.h>
-#include <libmemcached/csl/scanner.h>
+#include "libmemcached/csl/context.h"
+#include "libmemcached/csl/symbol.h"
+#include "libmemcached/csl/scanner.h"
 
 #ifndef __INTEL_COMPILER
 # pragma GCC diagnostic ignored "-Wold-style-cast"
index d82af27c6c407c04fe38fd070fafdfa32582db63..af1d2bf83f3b4f4f2f0f6687b3f089f280cf74df 100644 (file)
 
 %top{
 
-#include <libmemcached/csl/common.h>
-#include <libmemcached/csl/context.h>
-#include <libmemcached/csl/parser.h>
-#include <libmemcached/csl/symbol.h>
+#include "libmemcached/csl/common.h"
+#include "libmemcached/csl/context.h"
+#include "libmemcached/csl/parser.h"
+#include "libmemcached/csl/symbol.h"
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
index 10ff603a26fd7f2a7caa8a14f3c10df6f0e4bd3d..c185afddc98b28f3f33f8ebbf67f0897912321ef 100644 (file)
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <libmemcached/csl/common.h>
+#include "libmemcached/csl/common.h"
 
 union CONFIG_STYPE
 {
index ef1d8472528531e4157d8c21fc4d37adc20504f0..fc0f6ddcff836afab6c0e067f3ddd60edf203393 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 memcached_return_t memcached_delete(memcached_st *shell, const char *key, size_t key_length,
                                     time_t expiration)
index 59f9d5a3ada657c68d74da26837e5d90212fde30..19ccd1bb42bad6266c410130b3bc9ec9fc75b91a 100644 (file)
@@ -9,7 +9,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static memcached_return_t _vdo_udp(memcached_instance_st* instance,
                                    libmemcached_io_vector_st vector[],
index c0c4ed630c074190a9ca8c30b15893ea48b7d62b..2e6aa631084a901ad1a671f477c91cf5c03fe648 100644 (file)
@@ -42,7 +42,7 @@
   all slabs on servers and "grab" the keys.
 */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static memcached_return_t ascii_dump(Memcached *memc, memcached_dump_fn *callback, void *context, uint32_t number_of_callbacks)
 {
index 1e17d507a44b67b67756dcce0088d48283f17d43..c0b99ab9f76ef428fb1587adeab1eb00112e1045 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <libmemcached/common.h>
-#include <libmemcached/assert.hpp>
+#include "libmemcached/common.h"
+#include "libmemcached/assert.hpp"
 
 static void _set_encoding_key(Memcached& memc, const char *key, size_t key_length)
 {
index 3de8ece52be8ef41055b1dfb88e864de77d57da3..f0f0d97c1f23ce9487a68df8ff1db3838b86ae5a 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #include "libmemcached/assert.hpp"
 
index 5cb99e60661ee68210db150e39f09901649cfd38..c5aef71cd9ad21345744a5e304e4aa4f51ee468c 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static memcached_return_t ascii_exist(Memcached *memc, memcached_instance_st* instance, const char *key, size_t key_length)
 {
index d795109259108b5bde95c5682cf5ca04f523790b..2303688c170c4cb5215776b596812ee97e83c3fd 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 char *memcached_fetch(memcached_st *shell, char *key, size_t *key_length, 
                       size_t *value_length, 
index 09b401e6f8d972b52ab779744b87bcfbe8993863..99327541c1240b116bc9c4b72b15c22da4bccb25 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 bool memcached_flag(const memcached_st& memc, const memcached_flag_t flag)
 {
index 9702771f68b64be9b699f680bca51e52c65987c7..82b8b8f655845d326882b6a42a08852e238763a0 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static memcached_return_t memcached_flush_binary(Memcached *ptr, 
                                                  time_t expiration,
index 24f7c0df69ae348afae8aad95cb2ad8638347555..d40bd327702de60b2c335e731e818297e8c4ced2 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 memcached_return_t memcached_flush_buffers(memcached_st *shell)
 {
index 86d8cf2e13522b625cf35f4acd8a1de23636e733..57e2ae72736d8e3507343d168d66ab001c12da31 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 /*
   What happens if no servers exist?
index 4e02312e61cd6ec969d6d772ea77dd65a82dae31..aa5dbfaf3de549b431c18640a8f7e465eb4639cd 100644 (file)
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #include <sys/time.h>
 
-#include <libmemcached/virtual_bucket.h>
+#include "libmemcached/virtual_bucket.h"
 
 uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash_t hash_algorithm)
 {
index 98cb3f7d48dc777c1d4ca18f1c3f75b7a471f771..630a52d0996e52d3c3c4a693cc16b22490ae416b 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 #include "libmemcached/assert.hpp"
 
 #include <cmath>
index cef8e575f10f62e101d3d16c466ed0cd2980f2a6..34daa4e92e9cee65448e91b275af25ea89e032bb 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 memcached_return_t initialize_query(Memcached *self, bool increment_query_id)
 {
index df08c6066b3eabcb32959e39fd66d654d8d76200..751188c720ea421b208a7b3ee3f240deafd2bcce 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static inline void _server_init(memcached_instance_st* self, Memcached *root,
                                 const memcached_string_t& hostname,
index 13c8cf315c38c1cc9e9a8d945371f995f5d495a6..79007aaf1d8444bc2045958028d48565a58d1222 100644 (file)
@@ -37,7 +37,7 @@
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
index cec0eece64400e83d3645234bca3bbc3e53e29ed..0848c7968012223a1d5bf64f63058b330726655f 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool)
 {
index 6e88c257d1c79a0cf7735f8f471cfc6e524c8623..c39ca01980ce0124d79cd337b5f22fc368e5695f 100644 (file)
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
-#include <libmemcached/options.hpp>
-#include <libmemcached/virtual_bucket.h>
+#include "libmemcached/options.hpp"
+#include "libmemcached/virtual_bucket.h"
 
 static inline bool _memcached_init(Memcached *self)
 {
index a45077eeaa374666a53436be7ebd7cff1dea53a2..011260426daae113d12796d02b803583f57f005c 100644 (file)
@@ -36,4 +36,4 @@
 
 #pragma once
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
index d38e6d24ac646050615cc9accf213d8cbfb05a70..75275be165c1dfdeb68f603e73345a2405067452 100644 (file)
@@ -36,5 +36,5 @@
 
 #pragma once
 
-#include <libmemcached-1.0/memcached.hpp>
+#include "libmemcached-1.0/memcached.hpp"
 
diff --git a/src/libmemcached/memcached/README.txt b/src/libmemcached/memcached/README.txt
deleted file mode 100644 (file)
index adcac80..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-For your convenience libmemcached contains a copy of protocol_binary.h so that
-you may compile libmemcached without having a memcached server with support
-for the binary protocol installed on your computer. Please do not modify this
-fine, but replace it with a fresh copy from a new distribution if they are 
-out of sync.
-
-Trond Norbye
diff --git a/src/libmemcached/memcached/protocol_binary.h b/src/libmemcached/memcached/protocol_binary.h
deleted file mode 100644 (file)
index 51e2c42..0000000
+++ /dev/null
@@ -1,728 +0,0 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright (c) <2008>, Sun Microsystems, Inc.
- * 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.
- *     * Neither the name of the  nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY SUN MICROSYSTEMS, INC. ``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 SUN MICROSYSTEMS, INC. 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.
- */
-/*
- * Summary: Constants used by to implement the binary protocol.
- *
- * Copy: See Copyright for the status of this software.
- *
- * Author: Trond Norbye <trond.norbye@sun.com>
- */
-
-#ifndef PROTOCOL_BINARY_H
-#define PROTOCOL_BINARY_H
-
-#include <libmemcachedprotocol-0.0/vbucket.h>
-
-/**
- * \addtogroup Protocol
- * @{
- */
-
-/**
- * This file contains definitions of the constants and packet formats
- * defined in the binary specification. Please note that you _MUST_ remember
- * to convert each multibyte field to / from network byte order to / from
- * host order.
- */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    /**
-     * Definition of the legal "magic" values used in a packet.
-     * See section 3.1 Magic byte
-     */
-    typedef enum {
-        PROTOCOL_BINARY_REQ = 0x80,
-        PROTOCOL_BINARY_RES = 0x81
-    } protocol_binary_magic;
-
-    /**
-     * Definition of the valid response status numbers.
-     * See section 3.2 Response Status
-     */
-    typedef enum {
-        PROTOCOL_BINARY_RESPONSE_SUCCESS = 0x00,
-        PROTOCOL_BINARY_RESPONSE_KEY_ENOENT = 0x01,
-        PROTOCOL_BINARY_RESPONSE_KEY_EEXISTS = 0x02,
-        PROTOCOL_BINARY_RESPONSE_E2BIG = 0x03,
-        PROTOCOL_BINARY_RESPONSE_EINVAL = 0x04,
-        PROTOCOL_BINARY_RESPONSE_NOT_STORED = 0x05,
-        PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
-        PROTOCOL_BINARY_RESPONSE_NOT_MY_VBUCKET = 0x07,
-        PROTOCOL_BINARY_RESPONSE_AUTH_ERROR = 0x20,
-        PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE = 0x21,
-        PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
-        PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82,
-        PROTOCOL_BINARY_RESPONSE_NOT_SUPPORTED = 0x83,
-        PROTOCOL_BINARY_RESPONSE_EINTERNAL = 0x84,
-        PROTOCOL_BINARY_RESPONSE_EBUSY = 0x85,
-        PROTOCOL_BINARY_RESPONSE_ETMPFAIL = 0x86
-    } protocol_binary_response_status;
-
-    /**
-     * Defintion of the different command opcodes.
-     * See section 3.3 Command Opcodes
-     */
-    typedef enum {
-        PROTOCOL_BINARY_CMD_GET = 0x00,
-        PROTOCOL_BINARY_CMD_SET = 0x01,
-        PROTOCOL_BINARY_CMD_ADD = 0x02,
-        PROTOCOL_BINARY_CMD_REPLACE = 0x03,
-        PROTOCOL_BINARY_CMD_DELETE = 0x04,
-        PROTOCOL_BINARY_CMD_INCREMENT = 0x05,
-        PROTOCOL_BINARY_CMD_DECREMENT = 0x06,
-        PROTOCOL_BINARY_CMD_QUIT = 0x07,
-        PROTOCOL_BINARY_CMD_FLUSH = 0x08,
-        PROTOCOL_BINARY_CMD_GETQ = 0x09,
-        PROTOCOL_BINARY_CMD_NOOP = 0x0a,
-        PROTOCOL_BINARY_CMD_VERSION = 0x0b,
-        PROTOCOL_BINARY_CMD_GETK = 0x0c,
-        PROTOCOL_BINARY_CMD_GETKQ = 0x0d,
-        PROTOCOL_BINARY_CMD_APPEND = 0x0e,
-        PROTOCOL_BINARY_CMD_PREPEND = 0x0f,
-        PROTOCOL_BINARY_CMD_STAT = 0x10,
-        PROTOCOL_BINARY_CMD_SETQ = 0x11,
-        PROTOCOL_BINARY_CMD_ADDQ = 0x12,
-        PROTOCOL_BINARY_CMD_REPLACEQ = 0x13,
-        PROTOCOL_BINARY_CMD_DELETEQ = 0x14,
-        PROTOCOL_BINARY_CMD_INCREMENTQ = 0x15,
-        PROTOCOL_BINARY_CMD_DECREMENTQ = 0x16,
-        PROTOCOL_BINARY_CMD_QUITQ = 0x17,
-        PROTOCOL_BINARY_CMD_FLUSHQ = 0x18,
-        PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
-        PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a,
-        PROTOCOL_BINARY_CMD_VERBOSITY = 0x1b,
-        PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
-        PROTOCOL_BINARY_CMD_GAT = 0x1d,
-        PROTOCOL_BINARY_CMD_GATQ = 0x1e,
-        PROTOCOL_BINARY_CMD_GATK = 0x23,
-        PROTOCOL_BINARY_CMD_GATKQ = 0x24,
-
-        PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
-        PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
-        PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
-
-        /* These commands are used for range operations and exist within
-         * this header for use in other projects.  Range operations are
-         * not expected to be implemented in the memcached server itself.
-         */
-        PROTOCOL_BINARY_CMD_RGET      = 0x30,
-        PROTOCOL_BINARY_CMD_RSET      = 0x31,
-        PROTOCOL_BINARY_CMD_RSETQ     = 0x32,
-        PROTOCOL_BINARY_CMD_RAPPEND   = 0x33,
-        PROTOCOL_BINARY_CMD_RAPPENDQ  = 0x34,
-        PROTOCOL_BINARY_CMD_RPREPEND  = 0x35,
-        PROTOCOL_BINARY_CMD_RPREPENDQ = 0x36,
-        PROTOCOL_BINARY_CMD_RDELETE   = 0x37,
-        PROTOCOL_BINARY_CMD_RDELETEQ  = 0x38,
-        PROTOCOL_BINARY_CMD_RINCR     = 0x39,
-        PROTOCOL_BINARY_CMD_RINCRQ    = 0x3a,
-        PROTOCOL_BINARY_CMD_RDECR     = 0x3b,
-        PROTOCOL_BINARY_CMD_RDECRQ    = 0x3c,
-        /* End Range operations */
-
-        /* VBucket commands */
-        PROTOCOL_BINARY_CMD_SET_VBUCKET = 0x3d,
-        PROTOCOL_BINARY_CMD_GET_VBUCKET = 0x3e,
-        PROTOCOL_BINARY_CMD_DEL_VBUCKET = 0x3f,
-        /* End VBucket commands */
-
-        /* TAP commands */
-        PROTOCOL_BINARY_CMD_TAP_CONNECT = 0x40,
-        PROTOCOL_BINARY_CMD_TAP_MUTATION = 0x41,
-        PROTOCOL_BINARY_CMD_TAP_DELETE = 0x42,
-        PROTOCOL_BINARY_CMD_TAP_FLUSH = 0x43,
-        PROTOCOL_BINARY_CMD_TAP_OPAQUE = 0x44,
-        PROTOCOL_BINARY_CMD_TAP_VBUCKET_SET = 0x45,
-        PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_START = 0x46,
-        PROTOCOL_BINARY_CMD_TAP_CHECKPOINT_END = 0x47,
-        /* End TAP */
-
-        PROTOCOL_BINARY_CMD_LAST_RESERVED = 0xef,
-
-        /* Scrub the data */
-        PROTOCOL_BINARY_CMD_SCRUB = 0xf0
-    } protocol_binary_command;
-
-    /**
-     * Definition of the data types in the packet
-     * See section 3.4 Data Types
-     */
-    typedef enum {
-        PROTOCOL_BINARY_RAW_BYTES = 0x00
-    } protocol_binary_datatypes;
-
-    /**
-     * Definition of the header structure for a request packet.
-     * See section 2
-     */
-    typedef union {
-        struct {
-            uint8_t magic;
-            uint8_t opcode;
-            uint16_t keylen;
-            uint8_t extlen;
-            uint8_t datatype;
-            uint16_t vbucket;
-            uint32_t bodylen;
-            uint32_t opaque;
-            uint64_t cas;
-        } request;
-        uint8_t bytes[24];
-    } protocol_binary_request_header;
-
-    /**
-     * Definition of the header structure for a response packet.
-     * See section 2
-     */
-    typedef union {
-        struct {
-            uint8_t magic;
-            uint8_t opcode;
-            uint16_t keylen;
-            uint8_t extlen;
-            uint8_t datatype;
-            uint16_t status;
-            uint32_t bodylen;
-            uint32_t opaque;
-            uint64_t cas;
-        } response;
-        uint8_t bytes[24];
-    } protocol_binary_response_header;
-
-    /**
-     * Definition of a request-packet containing no extras
-     */
-    union protocol_binary_request_no_extras {
-        struct {
-            protocol_binary_request_header header;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header)];
-    };
-    typedef union protocol_binary_request_no_extras protocol_binary_request_no_extras;
-
-    /**
-     * Definition of a response-packet containing no extras
-     */
-    typedef union {
-        struct {
-            protocol_binary_response_header header;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_response_header)];
-    } protocol_binary_response_no_extras;
-
-    /**
-     * Definition of the packet used by the get, getq, getk and getkq command.
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_get;
-    typedef protocol_binary_request_no_extras protocol_binary_request_getq;
-    typedef protocol_binary_request_no_extras protocol_binary_request_getk;
-    typedef protocol_binary_request_no_extras protocol_binary_request_getkq;
-
-    /**
-     * Definition of the packet returned from a successful get, getq, getk and
-     * getkq.
-     * See section 4
-     */
-    typedef union {
-        struct {
-            protocol_binary_response_header header;
-            struct {
-                uint32_t flags;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_response_header) + 4];
-    } protocol_binary_response_get;
-
-    typedef protocol_binary_response_get protocol_binary_response_getq;
-    typedef protocol_binary_response_get protocol_binary_response_getk;
-    typedef protocol_binary_response_get protocol_binary_response_getkq;
-
-    /**
-     * Definition of the packet used by the delete command
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_delete;
-
-    /**
-     * Definition of the packet returned by the delete command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_delete;
-
-    /**
-     * Definition of the packet used by the flush command
-     * See section 4
-     * Please note that the expiration field is optional, so remember to see
-     * check the header.bodysize to see if it is present.
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint32_t expiration;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_flush;
-
-    /**
-     * Definition of the packet returned by the flush command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_flush;
-
-    /**
-     * Definition of the packet used by set, add and replace
-     * See section 4
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint32_t flags;
-                uint32_t expiration;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
-    } protocol_binary_request_set;
-    typedef protocol_binary_request_set protocol_binary_request_add;
-    typedef protocol_binary_request_set protocol_binary_request_replace;
-
-    /**
-     * Definition of the packet returned by set, add and replace
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_set;
-    typedef protocol_binary_response_no_extras protocol_binary_response_add;
-    typedef protocol_binary_response_no_extras protocol_binary_response_replace;
-
-    /**
-     * Definition of the noop packet
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_noop;
-
-    /**
-     * Definition of the packet returned by the noop command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_noop;
-
-    /**
-     * Definition of the structure used by the increment and decrement
-     * command.
-     * See section 4
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint64_t delta;
-                uint64_t initial;
-                uint32_t expiration;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 20];
-    } protocol_binary_request_incr;
-    typedef protocol_binary_request_incr protocol_binary_request_decr;
-
-    /**
-     * Definition of the response from an incr or decr command
-     * command.
-     * See section 4
-     */
-    typedef union {
-        struct {
-            protocol_binary_response_header header;
-            struct {
-                uint64_t value;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_response_header) + 8];
-    } protocol_binary_response_incr;
-    typedef protocol_binary_response_incr protocol_binary_response_decr;
-
-    /**
-     * Definition of the quit
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_quit;
-
-    /**
-     * Definition of the packet returned by the quit command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_quit;
-
-    /**
-     * Definition of the packet used by append and prepend command
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_append;
-    typedef protocol_binary_request_no_extras protocol_binary_request_prepend;
-
-    /**
-     * Definition of the packet returned from a successful append or prepend
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_append;
-    typedef protocol_binary_response_no_extras protocol_binary_response_prepend;
-
-    /**
-     * Definition of the packet used by the version command
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_version;
-
-    /**
-     * Definition of the packet returned from a successful version command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_version;
-
-
-    /**
-     * Definition of the packet used by the stats command.
-     * See section 4
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_stats;
-
-    /**
-     * Definition of the packet returned from a successful stats command
-     * See section 4
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_stats;
-
-    /**
-     * Definition of the packet used by the verbosity command
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint32_t level;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_verbosity;
-
-    /**
-     * Definition of the packet returned from the verbosity command
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_verbosity;
-
-    /**
-     * Definition of the packet used by the touch command.
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint32_t expiration;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_touch;
-
-    /**
-     * Definition of the packet returned from the touch command
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_touch;
-
-    /**
-     * Definition of the packet used by the GAT(Q) command.
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                uint32_t expiration;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_gat;
-
-    typedef protocol_binary_request_gat protocol_binary_request_gatq;
-
-    /**
-     * Definition of the packet returned from the GAT(Q)
-     */
-    typedef protocol_binary_response_get protocol_binary_response_gat;
-    typedef protocol_binary_response_get protocol_binary_response_gatq;
-
-
-    /**
-     * Definition of a request for a range operation.
-     * See http://code.google.com/p/memcached/wiki/RangeOps
-     *
-     * These types are used for range operations and exist within
-     * this header for use in other projects.  Range operations are
-     * not expected to be implemented in the memcached server itself.
-     */
-    typedef union {
-        struct {
-            protocol_binary_response_header header;
-            struct {
-                uint16_t size;
-                uint8_t  reserved;
-                uint8_t  flags;
-                uint32_t max_results;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_rangeop;
-
-    typedef protocol_binary_request_rangeop protocol_binary_request_rget;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rset;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rsetq;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rappend;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rappendq;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rprepend;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rprependq;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rdelete;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rdeleteq;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rincr;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rincrq;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rdecr;
-    typedef protocol_binary_request_rangeop protocol_binary_request_rdecrq;
-
-
-    /**
-     * Definition of tap commands
-     * See To be written
-     *
-     */
-
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                /**
-                 * flags is a bitmask used to set properties for the
-                 * the connection. Please In order to be forward compatible
-                 * you should set all undefined bits to 0.
-                 *
-                 * If the bit require extra userdata, it will be stored
-                 * in the user-data field of the body (passed to the engine
-                 * as enginespeciffic). That means that when you parse the
-                 * flags and the engine-specific data, you have to work your
-                 * way from bit 0 and upwards to find the correct offset for
-                 * the data.
-                 *
-                 */
-                uint32_t flags;
-
-                /**
-                 * Backfill age
-                 *
-                 * By using this flag you can limit the amount of data being
-                 * transmitted. If you don't specify a backfill age, the
-                 * server will transmit everything it contains.
-                 *
-                 * The first 8 bytes in the engine specific data contains
-                 * the oldest entry (from epoc) you're interested in.
-                 * Specifying a time in the future (for the server you are
-                 * connecting to), will cause it to start streaming current
-                 * changes.
-                 */
-#define TAP_CONNECT_FLAG_BACKFILL 0x01
-                /**
-                 * Dump will cause the server to send the data stored on the
-                 * server, but disconnect when the keys stored in the server
-                 * are transmitted.
-                 */
-#define TAP_CONNECT_FLAG_DUMP 0x02
-                /**
-                 * The body contains a list of 16 bits words in network byte
-                 * order specifying the vbucket ids to monitor. The first 16
-                 * bit word contains the number of buckets. The number of 0
-                 * means "all buckets"
-                 */
-#define TAP_CONNECT_FLAG_LIST_VBUCKETS 0x04
-                /**
-                 * The responsibility of the vbuckets is to be transferred
-                 * over to the caller when all items are transferred.
-                 */
-#define TAP_CONNECT_FLAG_TAKEOVER_VBUCKETS 0x08
-                /**
-                 * The tap consumer supports ack'ing of tap messages
-                 */
-#define TAP_CONNECT_SUPPORT_ACK 0x10
-                /**
-                 * The tap consumer would prefer to just get the keys
-                 * back. If the engine supports this it will set
-                 * the TAP_FLAG_NO_VALUE flag in each of the
-                 * tap packets returned.
-                 */
-#define TAP_CONNECT_REQUEST_KEYS_ONLY 0x20
-                /**
-                 * The body contains a list of (vbucket_id, last_checkpoint_id)
-                 * pairs. This provides the checkpoint support in TAP streams.
-                 * The last checkpoint id represents the last checkpoint that
-                 * was successfully persisted.
-                 */
-#define TAP_CONNECT_CHECKPOINT 0x40
-                /**
-                 * The tap consumer is a registered tap client, which means that
-                 * the tap server will maintain its checkpoint cursor permanently.
-                 */
-#define TAP_CONNECT_REGISTERED_CLIENT 0x80
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 4];
-    } protocol_binary_request_tap_connect;
-
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                struct {
-                    uint16_t enginespecific_length;
-                    /*
-                     * The flag section support the following flags
-                     */
-                    /**
-                     * Request that the consumer send a response packet
-                     * for this packet. The opaque field must be preserved
-                     * in the response.
-                     */
-#define TAP_FLAG_ACK 0x01
-                    /**
-                     * The value for the key is not included in the packet
-                     */
-#define TAP_FLAG_NO_VALUE 0x02
-                    uint16_t flags;
-                    uint8_t  ttl;
-                    uint8_t  res1;
-                    uint8_t  res2;
-                    uint8_t  res3;
-                } tap;
-                struct {
-                    uint32_t flags;
-                    uint32_t expiration;
-                } item;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 16];
-    } protocol_binary_request_tap_mutation;
-
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                struct {
-                    uint16_t enginespecific_length;
-                    /**
-                     * See the definition of the flags for
-                     * protocol_binary_request_tap_mutation for a description
-                     * of the available flags.
-                     */
-                    uint16_t flags;
-                    uint8_t  ttl;
-                    uint8_t  res1;
-                    uint8_t  res2;
-                    uint8_t  res3;
-                } tap;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + 8];
-    } protocol_binary_request_tap_no_extras;
-
-    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_delete;
-    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_flush;
-    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_opaque;
-    typedef protocol_binary_request_tap_no_extras protocol_binary_request_tap_vbucket_set;
-
-
-    /**
-     * Definition of the packet used by the scrub.
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_scrub;
-
-    /**
-     * Definition of the packet returned from scrub.
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_scrub;
-
-
-    /**
-     * Definition of the packet used by set vbucket
-     */
-    typedef union {
-        struct {
-            protocol_binary_request_header header;
-            struct {
-                vbucket_state_t state;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_request_header) + sizeof(vbucket_state_t)];
-    } protocol_binary_request_set_vbucket;
-    /**
-     * Definition of the packet returned from set vbucket
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_set_vbucket;
-    /**
-     * Definition of the packet used by del vbucket
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_del_vbucket;
-    /**
-     * Definition of the packet returned from del vbucket
-     */
-    typedef protocol_binary_response_no_extras protocol_binary_response_del_vbucket;
-
-    /**
-     * Definition of the packet used by get vbucket
-     */
-    typedef protocol_binary_request_no_extras protocol_binary_request_get_vbucket;
-
-    /**
-     * Definition of the packet returned from get vbucket
-     */
-    typedef union {
-        struct {
-            protocol_binary_response_header header;
-            struct {
-                vbucket_state_t state;
-            } body;
-        } message;
-        uint8_t bytes[sizeof(protocol_binary_response_header) + sizeof(vbucket_state_t)];
-    } protocol_binary_response_get_vbucket;
-
-
-    /**
-     * @}
-     */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* PROTOCOL_BINARY_H */
diff --git a/src/libmemcached/memcached/vbucket.h b/src/libmemcached/memcached/vbucket.h
deleted file mode 100644 (file)
index e2cc563..0000000
+++ /dev/null
@@ -1,59 +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
-
-typedef enum {
-    vbucket_state_active = 1, /**< Actively servicing a vbucket. */
-    vbucket_state_replica, /**< Servicing a vbucket as a replica only. */
-    vbucket_state_pending, /**< Pending active. */
-    vbucket_state_dead /**< Not in use, pending deletion. */
-} vbucket_state_t;
-
-#define is_valid_vbucket_state_t(state) \
-    (state == vbucket_state_active || \
-     state == vbucket_state_replica || \
-     state == vbucket_state_pending || \
-     state == vbucket_state_dead)
-
-#ifdef __cplusplus
-}
-#endif
index 12d02849124263cce017a35ee6a054d2c101c22f..2a805455ed0af8a904ab22ffd6f56257a16eeb5d 100644 (file)
@@ -36,9 +36,9 @@
 
 #pragma once
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #ifdef __cplusplus
 #include <cstddef>
index 290cfc895b434c90868563ae37476237454dca84..c15187bb1a8c0bd8ac42d606cc73aba714e97bf0 100644 (file)
  *
  */
 
-#include <libmemcached/common.h>
-#include <libmemcached/options.hpp>
+#include "libmemcached/common.h"
+#include "libmemcached/options.hpp"
 
-#include <libmemcached/csl/context.h>
+#include "libmemcached/csl/context.h"
 
 const char *memcached_parse_filename(memcached_st *memc)
 {
index 7665b731b3767f7c548f8e3ffbb3a0615b00ca8d..ef37e5390ab09e0f68a6c5c194a2edf0cc8938c2 100644 (file)
@@ -42,7 +42,7 @@
   Frankly its too damn useful not to be here though.
 */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 memcached_server_list_st memcached_servers_parse(const char *server_strings)
 {
index 4dbe24d05cb090e733f6d1a07d2b197c92d28af3..7f54672ce95e2928ff95eea41cef4e4b8ec50efb 100644 (file)
@@ -37,7 +37,7 @@
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 #define memcached_set_purging(__object, __value) ((__object)->state.is_purging= (__value))
 
index 5d17b3133e76375e92d8f88498ee73d52784e967..ad16d2c1aa334b5a0c0efd5c5c129385e8aa9650 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 namespace {
   memcached_return_t send_quit_message(memcached_instance_st* instance)
index 3d1e764e39c9ddc6961c604a3361c83f943dc60d..d2e2603f94682fc0d65ca2af6cda8a775a547584 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <libmemcached/common.h>
-#include <libmemcached/string.hpp>
+#include "libmemcached/common.h"
+#include "libmemcached/string.hpp"
 
 static memcached_return_t textual_value_fetch(memcached_instance_st* instance,
                                               char *buffer,
index 6fa507b28e60bf541105cee7ec34c82c7040e3aa..7f2300cfce755c50307836eedb9c5e81cb1f2028 100644 (file)
@@ -42,7 +42,7 @@
   to memcached we will be able to absorb new attributes without having
   to addjust the entire API.
 */
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static inline void _result_init(memcached_result_st *self,
                                 Memcached *memc)
index e2837c7d03c84e2f43248db2bfa5892375564227..bb8420e31164be053381157279a602cee827510c 100644 (file)
@@ -38,7 +38,7 @@
 /*
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static inline void _server_init(memcached_server_st *self, Memcached *root,
                                 const memcached_string_t& hostname,
index b5d5b72ee5b7c84eca79858cf27d4eb3c7255388..d8c9c40af900f634d219289fd11003a0d0bb8ff8 100644 (file)
@@ -37,7 +37,7 @@
 
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 memcached_server_list_st 
 memcached_server_list_append_with_weight(memcached_server_list_st ptr,
index 9e6083e9d841a9f0d6f7425d9ddff3e827e1f33e..c07403b4cd0c65138e9260b45a64efad0705f772 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static const char *memcached_stat_keys[] = {
   "pid",
index 61ca8270cce22d77ac8db9f7c4c32c81709b9329..236dd14651179a57dd3a10923b325919f266c92d 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 enum memcached_storage_action_t {
   SET_OP,
index c5615ca9f37e55cef5c8d20d8175e86cba35d679..7b3a9df34c79863685000d24820116fd240fbb35 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 const char *memcached_strerror(const memcached_st *, memcached_return_t rc)
 {
index b821aca61edcb1de951774d4a81b2ca1f75b19e5..6ac24c78e4336bc4cca913103f8c1838da939e55 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 inline static memcached_return_t _string_check(memcached_string_st *string, size_t need)
 {
index 9e9cbd6e3476a7352c8dd8389e664775950def1b..a4bb585a4ce64c1fba2d2228827ca7e4cad2f0c7 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 static memcached_return_t ascii_touch(memcached_instance_st* instance,
                                       const char *key, size_t key_length,
index 5d21f9ff2d5396e40b98ed5afd03f7aa3e46f697..f58b5bb7b2c40d085d0af0e61a42e0eb5b066d6b 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 /*
  * The udp request id consists of two seperate sections
index 03ed6da569f31e5d08f8eabcfa4a8e1d0296d1ee..59405b5a551b6e90dde7ff36e26be33ccf25e39c 100644 (file)
@@ -36,5 +36,5 @@
 
 #pragma once
 
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcachedutil-1.0/util.h"
 
diff --git a/src/libmemcached/util/Makefile.am b/src/libmemcached/util/Makefile.am
deleted file mode 100644 (file)
index bbb94dd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST= libmemcachedutil.ver
-
-lib_LTLIBRARIES=
-
-if BUILD_LIBMEMCACHEDUTIL
-lib_LTLIBRARIES+= libmemcachedutil.la
-endif
-
-libmemcachedutil_la_SOURCES= memcached_pool.c
-libmemcachedutil_la_LDFLAGS= -version-info $(MEMCACHEDUTIL_LIBRARY_VERSION) $(LD_UTIL_VERSION_SCRIPT)
-libmemcachedutil_la_LIBADD= ${top_builddir}/libmemcached/libmemcached.la
index 43d7374428fcfec0ad450ccf5398ee9ded24dab7..315ee346faa14be22b36a0bf3f58043108606929 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 struct context_st
 {
index 53d24c1cb02dc7eb51003a0557675b661fd4cc7d..6a04b83574a8c24ca930f8491caf5a3e5af00255 100644 (file)
@@ -34,7 +34,7 @@
  *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 const char * memcached_lib_version(void) 
 {
index 951881bd390e42640fbda13bed64f2c230933451..e68aa789a73258548979ab4bbbca84263e9d923b 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <libmemcached/common.h>
+#include "libmemcached/common.h"
 
 struct bucket_t {
   uint32_t master;
index 449b650d7e8e9f5b46fd2373c98b705f6b82254d..a6ecadabae201bf57f6c0b6222257ccbe5e0acbc 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcachedprotocol/common.h>
+#include "libmemcachedprotocol/common.h"
 
 #include <ctype.h>
 #include <stdio.h>
index d720424a9cc82aac7fc197ef01614809da60654f..37cd3778a76e665fa3bbe656f07646c8fb8c9332 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <libmemcachedprotocol/common.h>
+#include "libmemcachedprotocol/common.h"
 
 #include <stdlib.h>
 #include <sys/types.h>
index 67c72eadd3a9f614ab14b7545517a57c4485414a..c68cc254db09c96a85348b32814777ac735ef4dd 100644 (file)
@@ -45,7 +45,7 @@
 #include <signal.h>
 #endif
 
-#include <libmemcachedprotocol/common.h>
+#include "libmemcachedprotocol/common.h"
 
 #ifndef NDEBUG
 const uint64_t redzone_pattern = 0xdeadbeefcafebabe;
index a4ddc2ca0d864f6c16db820b048930b02971d74b..20ebe985bc83ee15449665b2da29a406c447e4ac 100644 (file)
 #include "mem_config.h"
 #include <assert.h>
 
-#include <libmemcachedprotocol-0.0/handler.h>
-#include <libmemcachedprotocol/cache.h>
-#include <libmemcached/byteorder.h>
-#include <libmemcached/socket.hpp>
+#include "libmemcachedprotocol-0.0/handler.h"
+#include "libmemcachedprotocol/cache.h"
+#include "libmemcached/byteorder.h"
+#include "libmemcached/socket.hpp"
 
 /*
  * I don't really need the following two functions as function pointers
index afd708652c245e9decb61be8ce9ba757c8b41703..24bd74a9d3f2b4f8875a468760e5aaedf9376a94 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-#include <libmemcachedprotocol/common.h>
+#include "libmemcachedprotocol/common.h"
 
 #include <stdlib.h>
 #include <sys/types.h>
index 54a2add0b96e44edfb8b9d6e9fa36b290d6f6d38..cfbc819449c355edf6135046cadc1361027ee1f2 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-#include <libmemcachedprotocol/common.h>
+#include "libmemcachedprotocol/common.h"
 
 #include <sys/types.h>
 
index 6a99603f1d6124a4d86fc2d1d05587ac8cc6d7b4..99d07e873f989d3fb818e6591c00cc9db1817f0d 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include <libmemcachedutil/common.h>
+#include "libmemcachedutil/common.h"
 
 
 bool libmemcached_util_flush(const char *hostname, in_port_t port, memcached_return_t *ret)
index 346561183b40c89e222615dfd2b125081d22fc92..eabdd442cc747746cbeecdba1a531c2d3e51801c 100644 (file)
@@ -37,7 +37,7 @@
  *
  */
 
-#include <libmemcachedutil/common.h>
+#include "libmemcachedutil/common.h"
 
 
 // Never look at the stat object directly.
index a867c56b36592bcfd9342b34bb3532f280a14605..c48037a12b3807caa63d5a4316cb22e0be5e6e27 100644 (file)
@@ -37,7 +37,7 @@
  *
  */
 
-#include <libmemcachedutil/common.h>
+#include "libmemcachedutil/common.h"
 
 bool libmemcached_util_ping(const char *hostname, in_port_t port, memcached_return_t *ret)
 {
index 8d7602465da8b0de4fc635c6b1580ff164b6b70a..4a41158cf6aa73f14e53764c8773d32ae7147d74 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libmemcachedutil/common.h>
+#include "libmemcachedutil/common.h"
 
 #include <cassert>
 #include <cerrno>
index 75a8f60e897bbea14ced390539dba3f02cd01147..91d6cbe9b8f1c851e7870950aaffc203b51e297f 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <libmemcachedutil/common.h>
+#include "libmemcachedutil/common.h"
 #include <cassert>
 
 struct local_context
index 6193fbb3cd094065a089c9a21cc84a1c67ae0127..027a646a88cbb1313cc63870df4b0b950751a66b 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <sys/time.h>
 #include <cstdlib>
index 5100a388628a86d3bf5a90bf5efd2e0ecac635c8..54a0353cefbb1cdaafd92aa7ebf5910a001fb6c8 100644 (file)
@@ -36,9 +36,9 @@
 
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
-#include <libtest/blobslap_worker.h>
+#include "libtest/blobslap_worker.h"
 
 #include <cassert>
 #include <cerrno>
index c536e9dd47f06bbda942fbbaa7644d53dd6e3ad0..c6e8604e00faf3635f331e92f0d04d2fef2af674 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
index ff9c8869d7db8885229b1df7684aee3663b007d6..2bf15fec1c9ffabc9d0cecf8c6403fb1a112bdec 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 // @todo possibly have this code fork off so if it fails nothing goes bad
 static test_return_t runner_code(libtest::Framework* frame,
index a9f9cba843014229bfb88e79c316b7a3d320130a..2657449de3dd7684d9180108492fec960748df12 100644 (file)
@@ -36,9 +36,9 @@
 
 #pragma once
 
-#include <libtest/formatter.hpp>
+#include "libtest/formatter.hpp"
 
-#include <libtest/timer.hpp>
+#include "libtest/timer.hpp"
 
 namespace { class Framework; }
 
index 90d8b6a8def0594cef3663b9c7d83ebe4bca8b64..bba458fd2b6315e1469408f04890308bd46b1169 100644 (file)
 # define get_socket_errno() errno
 #endif
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <libtest/is_pid.hpp>
+#include "libtest/is_pid.hpp"
 
-#include <libtest/gearmand.h>
-#include <libtest/blobslap_worker.h>
-#include <libtest/memcached.h>
-#include <libtest/drizzled.h>
+#include "libtest/gearmand.h"
+#include "libtest/blobslap_worker.h"
+#include "libtest/memcached.h"
+#include "libtest/drizzled.h"
 
-#include <libtest/libtool.hpp>
-#include <libtest/killpid.h>
-#include <libtest/signal.h>
-#include <libtest/dns.hpp>
-#include <libtest/formatter.hpp>
+#include "libtest/libtool.hpp"
+#include "libtest/killpid.h"
+#include "libtest/signal.h"
+#include "libtest/dns.hpp"
+#include "libtest/formatter.hpp"
 
 struct FreeFromVector
 {
index c0c21937f9512b08dc127916cf14bb0ae1a89e5f..b9c748ead37f449b313058fae7fea03ac67329c4 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest {
 
index 9a7d81c0413a5abb8c02b9dcad7d8cd7d65ec28f..b238697c316e829d2b5768c8929ff20ef151ba5c 100644 (file)
@@ -39,9 +39,9 @@
 #include <typeinfo>
 
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/ostream.hpp>
-#include <libtest/memcached.hpp>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/ostream.hpp"
+#include "libtest/memcached.hpp"
 #endif
 
 #if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
index 2542f43f5146dd45ec99bca783b37f0b17b84d8e..840149566eaf37aac8309850e47fbb36abe95125 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 
 namespace libtest {
index 36ebc2260baa6b06622c422c16aedb9af70aef0e..40306fdcc9f0a35393a6fda8fcda1ae3ca610667 100644 (file)
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libtest/cpu.hpp>
+#include "libtest/cpu.hpp"
 
 static void version_command(const char *command_name, int major_version, int minor_version)
 {
index c62d6c25e0fc6ddb052cfd0310433682dc421d56..1ae99a7f2c8c86338cebc9e871345dcf428b9f4c 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <unistd.h>
 
index 75a5bbfbf420352aacc907174a7eca932715c273..cbc8112320808ae349651df84a38f7b63b7740f8 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
index 42f9222dde6b12fb324f2a54c4adc9f911932abe..6d42efa90477c573dfc80581fe80e9e015f84cf2 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest {
 
index 3a93b6664817e6131349d88e72ce63b88719dc1b..9d58ce7e0796de4bbe8d35f317b26174099f3829 100644 (file)
@@ -35,9 +35,9 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
-#include <libtest/drizzled.h>
+#include "libtest/drizzled.h"
 
 #include "util/instance.hpp"
 #include "util/operation.hpp"
index 0b18f777b470db364e76c7774dcd176715c5eb3a..d1fa07687e95a594b94fb49a00980c111e1071a8 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 #include <cstdarg>
 
 namespace libtest {
index 5a3bab5eefa5978d36cdbe2c8c7d24a2be76f9d5..7f3919948e4bc86fb03d61e86859b07aa5c8ee88 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 #include "libtest/exception.hpp"
 #include <cstdarg>
 
index df5d083f923605dcb64e5a820d495cd30fc5dca5..4e687074aaa580a500cc276a91230adb8726efc4 100644 (file)
@@ -35,9 +35,9 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
-#include <libtest/failed.h>
+#include "libtest/failed.h"
 
 #include <iostream>
 #include <string>
index 443256b617ecf66ddeb8c98144f8710f8e629c2e..296c056bb2042b8ca4eaf4ac3bf6dd0d831b3922 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <algorithm>
 #include <fstream>
index 2c9ba74b4aebc346b40856eb51b358a4263077a0..2565e9c0713b61f45e7040437e49746ad3708d44 100644 (file)
@@ -36,9 +36,9 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
-#include <libtest/collection.h>
-#include <libtest/signal.h>
+#include "libtest/common.h"
+#include "libtest/collection.h"
+#include "libtest/signal.h"
 
 #include <algorithm>
 #include <fnmatch.h>
index 361779db7387b5778ac2da80fdc5894738adff3e..58c7ad996a91d229c466eb717cc92ecc495a14f6 100644 (file)
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <libtest/signal.h>
+#include "libtest/signal.h"
 
 /**
   Framework is the structure which is passed to the test implementation to be filled.
index 852cf19496e829c88cbbc311378d876f97507434..6ff824cafe7ebd94e39c67c36091b44201157eb4 100644 (file)
@@ -35,9 +35,9 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
-#include <libtest/gearmand.h>
+#include "libtest/gearmand.h"
 
 using namespace libtest;
 
index 74b4aa26112b58e7a282b807f2c471944473124f..031f2a7b68ad6732fc24e7527607f7d26f1ca114 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cstdio>
 #include <cstdlib>
index 465ce6186708c9d3c5eeb78fb0703343e4d7e056..cf85cdf7526728830d4651c12d1f0a58e593b663 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #if defined(HAVE_LIBCURL) && HAVE_LIBCURL
 #include <curl/curl.h>
index 682782181cc6a7a3609f04c0b50eff842128da02..4c3261174957a668ef1985d641ccd8ef2dc30f6c 100644 (file)
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <libtest/vchar.hpp>
+#include "libtest/vchar.hpp"
 
 namespace libtest {
 namespace http {
index ef4059c380e87f3f10a8233cd6fa2dff1c75cb9c..1473df140bfa62e1abb2d411a453360e5f40ddf5 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 
 namespace libtest {
index 2cefff2c60642170b414b86a5ebf344dcecb0507..af74442f525ac6dfad6c15e0be789823386e91d1 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cstdlib>
 #include <cstring>
@@ -47,8 +47,8 @@
 #include <sys/wait.h>
 
 
-#include <libtest/killpid.h>
-#include <libtest/stream.h>
+#include "libtest/killpid.h"
+#include "libtest/stream.h"
 
 using namespace libtest;
 
index 9d4b0f50e8ee918c824ae0fa680cbf6afacbc451..7a8e838c6cc2a9f93dbd5b627dd132c689b480e8 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 #include <string>
 
 char _libtool[1024]= { 0 };
index 36f873e8be6649649e1da6db33003306f830b5bc..a0bdc57ab0b8ab8cb314949dbd01bb491352794f 100644 (file)
@@ -77,7 +77,7 @@
 # define SKIP(__message_format, ...)
 #endif
 
-#include <libtest/valgrind.h>
+#include "libtest/valgrind.h"
 
 static inline size_t yatl_strlen(const char *s)
 {
index f20cb955713c1294d329b05bddfb2ef4e38ddabb..5684ba46dd0be0b8e7cc738fd9e0523b25b7bbeb 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cassert>
 #include <cstdlib>
index caeb11c363e90312f661bf46949207b268351a7b..0c16383e38af395dabcd9a07db751af9579b98c0 100644 (file)
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <libtest/server.h>
-#include <libtest/wait.h>
+#include "libtest/server.h"
+#include "libtest/wait.h"
 
-#include <libtest/memcached.h>
+#include "libtest/memcached.h"
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
index d8e8c12d566beca74fc96836a9f0635b67342b5a..73ac67d0ec5a0175a012d379b1e7e77f4b1b28f9 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cassert>
 #include <cstdlib>
@@ -55,7 +55,7 @@
 
 #include <signal.h>
 
-#include <libtest/signal.h>
+#include "libtest/signal.h"
 
 #ifndef SOCK_CLOEXEC 
 #  define SOCK_CLOEXEC 0
index 3e4523d3b42b2dc36cc766e9929a02ee2d826643..84b5067602ce72551d27ba331d2968dda4fd68ce 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 #include <cstdarg>
 
 namespace libtest {
index 79acbb40ede8e6bed81bfbb55966802b4454b8f8..66461de550042bcbe83a5083b6c39e4a62353864 100644 (file)
 
 #pragma once
 
-#include <libtest/result/base.hpp>
-#include <libtest/result/fail.hpp>
-#include <libtest/result/skip.hpp>
-#include <libtest/result/success.hpp>
+#include "libtest/result/base.hpp"
+#include "libtest/result/fail.hpp"
+#include "libtest/result/skip.hpp"
+#include "libtest/result/success.hpp"
 
 #define _SUCCESS throw libtest::__success(LIBYATL_DEFAULT_PARAM)
 
index 2f94ad37b870602333f6966389e7eee2f9bdf578..d5d8d5be42bb89da0c20d4659cf8d806e248e001 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest {
 
index bfb265cdb5811520b22a45d0a689ac36e29f1a96..3c60143b1fce2cc26ef27289cd537b2e90dda683 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cassert>
 #include <cerrno>
@@ -57,9 +57,9 @@ static inline std::string &rtrim(std::string &s)
   return s; 
 }
 
-#include <libtest/server.h>
-#include <libtest/stream.h>
-#include <libtest/killpid.h>
+#include "libtest/server.h"
+#include "libtest/stream.h"
+#include "libtest/killpid.h"
 
 namespace libtest {
 
index 73ad3bf846d3910676672211d84d00cdadf7d2ea..3e6f172466ceec932c9d116bbe3cf9e3cef413f5 100644 (file)
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <libtest/cmdline.h>
+#include "libtest/cmdline.h"
 
 #include <cassert>
 #include <cstdio>
index 70012f1d94ad672e8a01d036e7e491ccd4662b66..bf2572517a97513c81bb2dbf1e68ba32dadcdd47 100644 (file)
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <csignal>
 
-#include <libtest/signal.h>
+#include "libtest/signal.h"
 
 using namespace libtest;
 
index 098a575335cbe0759fc894b4645d9bbd3de820f2..6ff0e7e8e234a3d8a10342e619ff75d20504bda4 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
 #include <cstdlib>
 #include <unistd.h>
index 9e06841ac9abe2de3b64f7ee69c4a699ad863959..a681dd8285e62d94b64137b8236b5d7b19f78ce7 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 static char global_socket[1024]= { 0 };
 
index ebbc1e4fb3ad1b54cc1987f5ba543b07bee731e7..7701e91f678719fa37036771ce79572db11e2261 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest { 
 
index 3c3c37d1b0d10e97ca1d0821e3631b554416d25a..bd5419c79984f60e9c14e6a5e0ca3004d14f79b3 100644 (file)
@@ -40,7 +40,7 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
-#include <libtest/lite.h>
+#include "libtest/lite.h"
 
 /**
   A structure describing the test case.
index d904070008c8a64b3fe0586be8aa03490fa5d5d5..b4ccfa4219d4abdea6760db2f9777bf927f9a00a 100644 (file)
 #include <cstdlib>
 #include <arpa/inet.h>
 
-#include <libtest/visibility.h>
-#include <libtest/version.h>
+#include "libtest/visibility.h"
+#include "libtest/version.h"
 
-#include <libtest/vchar.hpp>
-#include <libtest/error.h>
-#include <libtest/exception.hpp>
-#include <libtest/exception/disconnected.hpp>
-#include <libtest/exception/fatal.hpp>
-#include <libtest/result.hpp>
+#include "libtest/vchar.hpp"
+#include "libtest/error.h"
+#include "libtest/exception.hpp"
+#include "libtest/exception/disconnected.hpp"
+#include "libtest/exception/fatal.hpp"
+#include "libtest/result.hpp"
 
-#include <libtest/has.hpp>
-#include <libtest/error.h>
-#include <libtest/strerror.h>
-#include <libtest/timer.hpp>
-#include <libtest/alarm.h>
-#include <libtest/stream.h>
-#include <libtest/comparison.hpp>
-#include <libtest/server.h>
-#include <libtest/server_container.h>
-#include <libtest/wait.h>
-#include <libtest/callbacks.h>
-#include <libtest/test.h>
-#include <libtest/dream.h>
-#include <libtest/core.h>
-#include <libtest/runner.h>
-#include <libtest/port.h>
-#include <libtest/is_local.hpp>
-#include <libtest/socket.hpp>
-#include <libtest/collection.h>
-#include <libtest/framework.h>
-#include <libtest/get.h>
-#include <libtest/cmdline.h>
-#include <libtest/string.hpp>
-#include <libtest/binaries.h>
-#include <libtest/http.hpp>
-#include <libtest/cpu.hpp>
-#include <libtest/tmpfile.hpp>
-#include <libtest/client.hpp>
-#include <libtest/thread.hpp>
+#include "libtest/has.hpp"
+#include "libtest/error.h"
+#include "libtest/strerror.h"
+#include "libtest/timer.hpp"
+#include "libtest/alarm.h"
+#include "libtest/stream.h"
+#include "libtest/comparison.hpp"
+#include "libtest/server.h"
+#include "libtest/server_container.h"
+#include "libtest/wait.h"
+#include "libtest/callbacks.h"
+#include "libtest/test.h"
+#include "libtest/dream.h"
+#include "libtest/core.h"
+#include "libtest/runner.h"
+#include "libtest/port.h"
+#include "libtest/is_local.hpp"
+#include "libtest/socket.hpp"
+#include "libtest/collection.h"
+#include "libtest/framework.h"
+#include "libtest/get.h"
+#include "libtest/cmdline.h"
+#include "libtest/string.hpp"
+#include "libtest/binaries.h"
+#include "libtest/http.hpp"
+#include "libtest/cpu.hpp"
+#include "libtest/tmpfile.hpp"
+#include "libtest/client.hpp"
+#include "libtest/thread.hpp"
index fae814cad09c61f2e446102aee4659c377ff77a8..a3457862239cea2b06780e14e3deac40e7b5bca4 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/timer.hpp>
+#include "libtest/timer.hpp"
 
 #include <ctime>
 #include <iomanip>
index 425a21e7b730fe15c3ae73c9041a17b5dcbc8992..5bf223374d2c0f48191b32b2b6a35d8f97df21f0 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest {
 
index 9283b84ad1659b3091838e70fefc18204204354a..e08397f4a5f6ac7de1f3609e8c2301f33b6112f6 100644 (file)
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 namespace libtest {
 
index fafe032a047a90e8b66b04f43b2adb40cf45c67d..1a7a0d72a4bc81118e748821e5eb04ea1ce5413e 100644 (file)
 
 #include "libtest/yatlcon.h"
 
-#include <libtest/yatl.h>
+#include "libtest/yatl.h"
 
 #if defined(HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H) && HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H
-# include <libmemcached-1.0/types/return.h>
+# include "libmemcached-1.0/types/return.h"
 #endif
 
 #if defined(HAVE_LIBGEARMAN_1_0_RETURN_H) && HAVE_LIBGEARMAN_1_0_RETURN_H
index a4bddfdeda098eb8aa9d0523b90b3ad1f65114a0..2d89c341d01735fb82f26a3313d889922b730f98 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 #include "libtest/yatlcon.h"
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 /* Use this for string generation */
 static const char ALPHANUMERICS[]=
index d1292e188fb8b40c76acf1b7076e1f090d0f847a..0317f9ba1e5e8150250a5af3d7484900d6dad4d6 100644 (file)
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libtest/wait.h>
+#include "libtest/wait.h"
 
 static void version_command(const char *command_name, int major_version, int minor_version)
 {
index e5cdcb3d4766ca4d0cece1e85eb69bf50bf67d9a..ffb7b3eb81b4587059e21f95eca40e55857093ca 100644 (file)
@@ -40,7 +40,7 @@
 #include <string>
 #include <signal.h>
 
-#include <libtest/dream.h>
+#include "libtest/dream.h"
 
 namespace libtest {
 
index 6da02a3d11945e821384e2c43166bd6f0f04a60a..d1d6c3d11549b41bd3c14130484eac679cf89a39 100644 (file)
@@ -40,4 +40,4 @@
 # define YATL_FULL 1
 #endif
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
index 90e29efb52da2889a241a8f1a6c46214d70d6d68..3c65a7bb8a247bb4a2165c53d69052b121eda63c 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #if defined __SUNPRO_C || defined __DECC || defined __HP_cc
 # pragma ident "@(#)$Header: /cvsroot/wikipedia/willow/src/bin/willow/daemon.c,v 1.1 2005/05/02 19:15:21 kateturner Exp $"
index 3b84a27815a71480e39b6c9f81837b390c44572e..974f27dd20c64d17cab724f01361cef941101670 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include "util/operation.hpp"
 #include <string>
index 8e63016fddde41a5cd140ea27d2551b1f9ce4d2b..b1a7a4e22c45ab881cbef7a086c16148a715bb69 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cassert>
 #include <cerrno>
index d801291302e8994de936257d9f7dafcbadd2fb9d..c53e75139e2190f3dc493598cf2f5621252a5443 100644 (file)
@@ -1,11 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
 
 Name: libmemcached
-URL: http://libmemcachd.org/
-Description: libmemcached C/C++ library.
-Version: @VERSION@
-Libs: -L${libdir} -lmemcached -lmemcachedutil
-Cflags: -I${includedir}
+URL: https://m6w6.github.io/libmemcached/
+Description: libmemcached C/C++ library
+Version: @PROJECT_VERSION@
+Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lmemcached -lmemcachedutil
+Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
index cb9669ffc4725d71b11c1afdf6d2eb7dae6288a8..e3207d8b53f6cf60c2925b199748c735d11b1e4a 100644 (file)
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <libtest/visibility.h>
+#include "libtest/visibility.h"
 
 #ifdef __cplusplus
 extern "C" {
index c490ac2d987924fc5ca60cf3d8d6b9b9f4eed20a..0aa375e27bc41dcaf82f039713a35de02a8ac56c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * An example file showing the usage of the C++ libmemcached interface.
  */
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <vector>
 #include <string>
@@ -11,7 +11,7 @@
 
 #include <string.h>
 
-#include <libmemcached/memcached.hpp>
+#include "libmemcached/memcached.hpp"
 
 using namespace std;
 using namespace memcache;
index 0137b03895dad3d715dc222b5fb9166652fe4b5b..618994b3ea8ecb722b936e41bf86dcc810533bd6 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 static test_return_t server_startup_single_TEST(void *obj)
 {
index 64b2fa7f98d6b43831642ee9a79f3506cc82b204..facaa7d5032f6f0719c0e8eb4db63fc70b513efc 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 /*
   C++ interface test
 */
-#include <libmemcached-1.0/memcached.hpp>
-#include <libmemcached/server_instance.h>
-#include <libtest/test.hpp>
+#include "libmemcached-1.0/memcached.hpp"
+#include "libmemcached/server_instance.h"
+#include "libtest/test.hpp"
 
 #include <cstdio>
 #include <cstdlib>
index 8675adef12a6e50afdeb06a7c6c8614d9470c38a..720f6e1c094feccf0351f225b34615bb31002ecc 100644 (file)
@@ -2,15 +2,15 @@
   C++ to libhashkit
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 
-#include <libhashkit-1.0/hashkit.hpp>
+#include "libhashkit-1.0/hashkit.hpp"
 
 using namespace libtest;
 
index 59c53809c1e065360417643087cf20c697bceb0d..5d070afb6b0b2442e102771e6d8ab2a3f57197c0 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -44,8 +44,8 @@ using namespace libtest;
 #include <cstdlib>
 #include <cstring>
 
-#include <libhashkit-1.0/hashkit.h>
-#include <libhashkit/is.h>
+#include "libhashkit-1.0/hashkit.h"
+#include "libhashkit/is.h"
 
 #include "tests/hash_results.h"
 
index 37471773463f03b6060849f440039d984f4a7e21..a7cbd2c0aad1d4f6b10b40de240851ba5e5781ad 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 #include "libmemcached-1.0/memcached.h"
 #include "tests/basic.h"
 #include "tests/debug.h"
index fc3aa6664c5136994765c24f0568c58d5e1a37f5..ad8a37f50410dd97885e6e86a4393186105f3855 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 #include "libmemcached-1.0/memcached.h"
 #include "tests/basic.h"
 #include "tests/debug.h"
index 3a87bd23728510d7c15443a06e77911f932c971f..169f503fa9af18766b7e99809774c87ae7bd9dfb 100644 (file)
 /*
   Sample test application.
 */
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -30,9 +30,9 @@
 #include <bin/generator.h>
 #include <bin/execute.h>
 
-#include <libtest/server.h>
+#include "libtest/server.h"
 
-#include <tests/debug.h>
+#include "tests/debug.h"
 
 #include "tests/libmemcached-1.0/generate.h"
 
index 715490dcffea62ec28f9843a7da1073f1b5b485e..b6df5b475a8d6b473409916e222123c1bbeab3a6 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "libmemcached/is.h"
 
 #include "tests/basic.h"
index a3f43de205f19d92bd9b6a54acafc5d7bf6015f5..fd52ca25e60d4c5583da7b34586d90d8db4f3c2c 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "mem_config.h"
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 #include "tests/libmemcached-1.0/callback_counter.h"
 
 memcached_return_t callback_counter(const memcached_st*, memcached_result_st*, void *context)
index 89eb75f7b3e39aec4fb4d9a83a366e9465e1c06d..1f8c516238900ba70f5881aa381fb634c8a88c6e 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 #include "libmemcached-1.0/memcached.h"
-#include <tests/callbacks.h>
+#include "tests/callbacks.h"
 
 using namespace libtest;
 
index 83241f439229897f869a198fdaf0b5e7a8f2383a..3d5cda3d1c4ae29bbcba6177b92b872ef8275a88 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 #include <climits>
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
-#include <tests/debug.h>
-#include <tests/print.h>
+#include "libmemcached-1.0/memcached.h"
+#include "tests/debug.h"
+#include "tests/print.h"
 
 #include "libmemcached/instance.hpp"
 
index 891a4c940698a2043750297c1e7f7629b9a83d63..cfc0e23e4cbaba00af3397ea3c865604a376e237 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <tests/deprecated.h>
+#include "libmemcached-1.0/memcached.h"
+#include "tests/deprecated.h"
 
 test_return_t server_list_null_test(memcached_st *ptr)
 {
index c0da31c4b7343b8c5be6c2f1de63453d1d2a04b7..9740d6983172c643f92aa07d5743c54780ea8187 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdlib>
 #include <climits>
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 using namespace libtest;
 
index 247075829ec57cee2a88e6ec70e4151acee2908d..cd245cf68c6b6b30cc0203088a0411eabc161d62 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 #include "tests/libmemcached-1.0/encoding_key.h"
 
index 584f4c69c2dc4de052f882b5c8248ff3a4d41a3e..b9481b17c2c47ce9fa854dea62b265cefa75fc3b 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 #define BUILDING_LIBMEMCACHED
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "libmemcached/is.h"
 
-#include <tests/error_conditions.h>
+#include "tests/error_conditions.h"
 
 test_return_t memcached_increment_MEMCACHED_NO_SERVERS(memcached_st *)
 {
index 912785d832417521f162d0cf072360e900a50a0a..caf7429e16a57079b0b7f046ace64f5c56f601e1 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 #include "libmemcached-1.0/memcached.h"
-#include <tests/exist.h>
+#include "tests/exist.h"
 
 using namespace libtest;
 
index b753213483a957d615119ccaa500ce2bcbfcefdd..d0690508a01754e2a0efc12de6d961d22ce8f503 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
-#include <tests/libmemcached-1.0/fetch_all_results.h>
+#include "mem_config.h"
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
+#include "tests/libmemcached-1.0/fetch_all_results.h"
 
 test_return_t fetch_all_results(memcached_st *memc, unsigned int &keys_returned, memcached_return_t& rc)
 {
index 8af302b02e0a2db24ea375254ef713edfa106797..d876b209963619b484cbc13e993afa1dd33c72ef 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcachedutil-1.0/util.h>
-#include <libmemcached/is.h>
+#include "libmemcachedutil-1.0/util.h"
+#include "libmemcached/is.h"
 
-#include <tests/libmemcached-1.0/generate.h>
-#include <tests/libmemcached-1.0/fetch_all_results.h>
+#include "tests/libmemcached-1.0/generate.h"
+#include "tests/libmemcached-1.0/fetch_all_results.h"
 #include "tests/libmemcached-1.0/callback_counter.h"
 
 #include "bin/generator.h"
index 8e9f6cc4d1ad91348b62d0dc793e8118bc95d9c8..f695d988f1f422916168a5c7a8dcc006aa9944ce 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 #include "libmemcached-1.0/memcached.h"
 #include "tests/libmemcached-1.0/haldenbrand.h"
 #include "tests/libmemcached-1.0/fetch_all_results.h"
index 7aff7db8824f5ebd2c9932d1df9e524c39f0c2e6..2ccd43365cf775ba02d337230d7ec94a71370c77 100644 (file)
@@ -34,8 +34,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
index 83c18aa8c43459d554d8318c9cd177af219fe22e..99491fc395f0e8b2726c0fd9011e7985f68f935a 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "libmemcached/server_instance.h"
 #include "libmemcached/continuum.hpp"
 #include "libmemcached/instance.hpp"
 
-#include <tests/ketama.h>
-#include <tests/ketama_test_cases.h>
+#include "tests/ketama.h"
+#include "tests/ketama_test_cases.h"
 
 test_return_t ketama_compatibility_libmemcached(memcached_st *)
 {
index 74921f707c738e30c8e7532a28dbaab0d3d322cd..eedf002f6f1a08b3dca8fadc5194d193a9609c9b 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 #if defined(HAVE_LIBUUID) && HAVE_LIBUUID
 # include <uuid/uuid.h>
   Test cases
 */
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "libmemcached/is.h"
 #include "libmemcached/server_instance.h"
 
-#include <libhashkit-1.0/hashkit.h>
+#include "libhashkit-1.0/hashkit.h"
 
-#include <libtest/memcached.hpp>
+#include "libtest/memcached.hpp"
 
 #include <cerrno>
 #include <memory>
 
 #include <iostream>
 
-#include <libtest/server.h>
+#include "libtest/server.h"
 
 #include "bin/generator.h"
 
 #define SMALL_STRING_LEN 1024
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcachedutil-1.0/util.h"
 
 #include "tests/hash_results.h"
 
index c74d2ec9c69b992be6d5f07c3e3f98f2961fcf4c..a2673e0c34ee2d17243c7079e5389401b4470800 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcached/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcached/util.h"
 
 using namespace libtest;
 
index dc046544f893ccac9bee7dc91d0317539de30d72..7a4650d98ecca0ad0fb3d5273484d041c307bb6b 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 /*
   Test cases
 */
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 #include "tests/libmemcached-1.0/memcached_get.h"
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
 
index a1c362a9c79207309f373eae7f1c3501c0865223..29548b9ed79632427a2df593640a82135151f7d1 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
-#include <tests/namespace.h>
+#include "tests/namespace.h"
 
 test_return_t memcached_increment_namespace(memcached_st *memc)
 {
index 064c5cfb9fc69f8d205c5d5cdc902497963871c4..b5204a83a712d5c8d7f471c5f2bc84f4c3fa6e12 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -44,11 +44,11 @@ using namespace libtest;
 #include <string>
 #include <cerrno>
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/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>
+#include "tests/libmemcached-1.0/parser.h"
+#include "tests/print.h"
 #include "libmemcached/instance.hpp"
 
 enum scanner_type_t
index 5897dcb71338d6b81d9df67c5ea63181fda61814..b0f92f6ecb2a459c353b0bc7399d9cfb9670cfeb 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 /*
   C++ interface test
 */
-#include <libmemcached-1.0/memcached.hpp>
-#include <libtest/test.hpp>
+#include "libmemcached-1.0/memcached.hpp"
+#include "libtest/test.hpp"
 
 #include <cstdio>
 #include <cstdlib>
index 457cf962ea62413f4abd40802a63ad8a370002da..2693299632bd0703906ea713e600af6f96201239 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -47,10 +47,10 @@ using namespace libtest;
 
 #include <semaphore.h>
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
-#include <libmemcached/is.h>
-#include <tests/pool.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
+#include "libmemcached/is.h"
+#include "tests/pool.h"
 
 #include <pthread.h>
 #include <poll.h>
index 00222de38f38820303fc45ac9ebfee818bab1c7f..1e948eb48c94aff30abf7f47983d544c56eabe43 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
 
 #include <iostream>
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "tests/print.h"
 
index 937041f2cfa718a03deb709a97cde40c245769da..a760060ee5b040b55e150a8d9f0d68bfd273e085 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "libmemcached/server_instance.h"
 
-#include <tests/replication.h>
-#include <tests/debug.h>
+#include "tests/replication.h"
+#include "tests/debug.h"
 
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
 
index 44d0f31fbad57d383266ffa6ea3d7cd66d90a397..041af2055ce12c7357a268c6f88d0f057a9d9430 100644 (file)
@@ -34,8 +34,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -43,7 +43,7 @@ using namespace libtest;
   Test cases
 */
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 static test_return_t pre_sasl(memcached_st *)
 {
index 49eb8448977e5e8fc35a61fdf93127147785b0da..3b42e980b6bd9c5c30a07413b6f9d96bb76cc852 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/yatl.h>
+#include "mem_config.h"
+#include "libtest/yatl.h"
 
 #include <string>
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
-#include <tests/server_add.h>
+#include "tests/server_add.h"
 
 static std::string random_hostname()
 {
index 047497d69729d3130e27ae759f827b85df8256d7..9e69c7dd730a30f828ee75e832c37f28d3c77ede 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcachedutil-1.0/util.h"
 
 #include "tests/print.h"
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
index fe92230e81b6d545388c037e1757351e71cc6cd5..f65dea5f02afcd66171cc199221b217c85ac8e21 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdlib>
 #include <climits>
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 using namespace libtest;
 
index 25613d8f103aa3bd620575946d7937b353c8eb9f..2151fa8b66d54733013e10abcddc2d333ec18bec 100644 (file)
 // We let libmemcached/common.h define config since we are looking at
 // library internals.
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "libmemcached/string.hpp"
 #include "libmemcached/is.h"
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <tests/string.h>
+#include "tests/string.h"
 
 test_return_t string_static_null(void*)
 {
index 08ff68f4a4921add36039560d29ffed6cc75b5d0..5f894339dd24600eddb01688fe1944144ad97370 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 #include "tests/touch.h"
 
index a50477c9415f9de9da4fe5d0fd4661d43fd5a5df..99b19843798fb84904c92d252fcbae6e519fa350 100644 (file)
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <tests/virtual_buckets.h>
+#include "tests/virtual_buckets.h"
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include <cstring>
 
index 9c9fd0a3b4e353f1f9b01e7e035f90e3b58bfc2c..8610f2587ad798f5aafd19c1dde3c06e18e0ca57 100644 (file)
   Sample test application.
 */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcached/server_instance.h>
-#include <libmemcached/io.h>
-#include <libmemcached/udp.hpp>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcached/server_instance.h"
+#include "libmemcached/io.h"
+#include "libmemcached/udp.hpp"
+#include "libmemcachedutil-1.0/util.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -61,7 +61,7 @@ using namespace libtest;
 #include <unistd.h>
 #include <time.h>
 
-#include <libtest/server.h>
+#include "libtest/server.h"
 
 #include "libmemcached/instance.hpp"
 
index 6a9034399bddd2089f7bbddabe1b3b401aafae63..2bd1aec2ccdf1013d5da3158b7d31ad500e3fe33 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 1108b92f9871110025bbe841220ecfcf58c2bbea..1da52fd2543f06ca2d7f53cb9425b436b15de55b 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 547d568cd3f8e08597585c16307e8b1423e2ace1..89ded54c4ade924ecd50ab1701eff5249119adc8 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 #include <sys/stat.h>
 
index 2d9937b30fe125e2914a562e4a92037535881d29..0ad421f14b3310d179d763eddee12ba56203fc18 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 6920a169d29fb3bfafc77c1f990a486bd2743cea..816ef9de2f347212e6d824e2e830738fbe142a63 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index f2dd2f7a150bb9f25eb2b86914671038029c34cc..b081e685cf34c448c1f6c4a4a50ae258b14a7312 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 using namespace libtest;
 
index e7caf606d6ef82ef15dcc215f5c3255221accc34..06b38ea5219e2332e87da19ce2d35ff9a6eb8517 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 75c7687f2bb1c41f62e8b1c933ec98a0b7b74915..0712efd2d9c6ee5c41e0ede090a0925fcb444c8a 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index bc342b1a9c6ed2daa2c212053e7e5862cca8b2c7..e3c807bec5034d600d465a06dcd5137fae06e0c4 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 352c43bb31d6110bffaa7e2c49df34ae673e4118..a8fd174767c557f34cf34699656cf09ef55667d8 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index 168b5cd1ca42293d0b7caf8450f378a3e1b4a466..516ff7d91b5105305ed3e1132e067e6eead88ad7 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
 
 using namespace libtest;
 
index d7c798cd605b86601503d7cf7946bf870e071b89..f2d9a80c739d1938ce81bf635d6ac1be9a0fcd63 100644 (file)
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libtest/test.hpp"
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 using namespace libtest;
 
diff --git a/tests/parser.am b/tests/parser.am
deleted file mode 100644 (file)
index e0e1998..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim:ft=automake
-# Copyright (C) 2012 Data Differential
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-#
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-noinst_HEADERS+= tests/libmemcached-1.0/parser.h
-
-tests_parser_SOURCES=
-tests_parser_CXXFLAGS=
-tests_parser_LDADD=
-
-tests_parser_SOURCES+= tests/parser.cc
-
-tests_parser_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_parser_LDADD+= $(TESTS_LDADDS)
-check_PROGRAMS+= tests/parser
-noinst_PROGRAMS+= tests/parser
-
-test-parser: tests/parser
-       @tests/parser
-
-valgrind-parser: tests/parser
-       @$(VALGRIND_COMMAND) tests/parser
index 656c885a27c2e7fcd2cebdc3f694828f24e8a44b..5e164a3b6c43852524c9ba351992fec4eaf83a48 100644 (file)
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 /*
   C++ interface test
 */
-#include <libmemcached-1.0/memcached.hpp>
-#include <libtest/test.hpp>
+#include "libmemcached-1.0/memcached.hpp"
+#include "libtest/test.hpp"
 
 using namespace libtest;