Update all config.h usage.
authorBrian Aker <brian@tangent.org>
Mon, 29 Oct 2012 00:38:35 +0000 (20:38 -0400)
committerBrian Aker <brian@tangent.org>
Mon, 29 Oct 2012 00:38:35 +0000 (20:38 -0400)
126 files changed:
.bzrignore
Makefile.am
clients/execute.cc
clients/generator.cc
clients/memcapable.cc
clients/memcat.cc
clients/memcp.cc
clients/memdump.cc
clients/memerror.cc
clients/memexist.cc
clients/memflush.cc
clients/memparse.cc
clients/memping.cc
clients/memrm.cc
clients/memslap.cc
clients/memstat.cc
clients/memtouch.cc
clients/utilities.cc
configure.ac
example/byteorder.cc
example/memcached_light.cc
example/t/memcached_light.cc
libhashkit/common.h
libmemcached/common.h
libmemcached/memory.h
libmemcachedutil/common.h
libtest/alarm.cc
libtest/binaries.cc
libtest/blobslap_worker.cc
libtest/cmdline.cc
libtest/cmdline.h
libtest/collection.cc
libtest/common.h
libtest/comparison.cc
libtest/core.cc
libtest/core_count.cc
libtest/cpu.cc
libtest/dns.cc
libtest/dream.cc
libtest/drizzled.cc
libtest/drizzled.h
libtest/failed.cc
libtest/fatal.cc
libtest/formatter.cc
libtest/framework.cc
libtest/gearmand.cc
libtest/has.cc
libtest/http.cc
libtest/include.am
libtest/is_local.cc
libtest/killpid.cc
libtest/libtool.cc
libtest/main.cc
libtest/memcached.cc
libtest/port.cc
libtest/runner.cc
libtest/server.cc
libtest/server.h
libtest/server_container.cc
libtest/server_container.h
libtest/signal.cc
libtest/skiptest.cc
libtest/socket.cc
libtest/strerror.cc
libtest/test.hpp
libtest/timer.cc
libtest/timer.hpp
libtest/tmpfile.cc
libtest/unittest.cc
libtest/vchar.cc
libtest/wait.cc
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/memrm.cc
tests/memslap.cc
tests/memstat.cc
tests/memtouch.cc
tests/parser.cc
util/daemon.cc
util/instance.cc
util/operation.cc
util/signal.cc

index edf4f4c21cb9e9bf9d6fb1497f3c8f236a0b846b..ec7e48cdd8468aece48a74450f98840a41229ac1 100644 (file)
@@ -49,9 +49,9 @@ clients/memrm
 clients/memslap
 clients/memstat
 clients/memtouch
-config.h
-config.h.in
-config.in
+mem_config.h
+mem_config.h.in
+mem_config.in
 config.log
 config.status
 config/compile
index dcf1519afed67a55aec43171dc82cd45036b552e..d87bd414d1766f962c552396cfae98a6c3c3ad07 100644 (file)
@@ -128,7 +128,7 @@ maintainer-clean-local:
        -rm -f build-aux/install-sh
        -rm -f build-aux/ltmain.sh
        -rm -f build-aux/missing
-       -rm -f config.in
+       -rm -f mem_config.in
        -rm -f config.log
        -rm -f config.status
        -rm -f configure
index cf7779e5140c8f2afada67ebc5c1ab8c81e8d45d..3e9e4802dfd0bf3a96d2a138384e65fceecf95db 100644 (file)
@@ -15,7 +15,7 @@
   Return the number of rows set.
 */
 
-#include <config.h>
+#include <mem_config.h>
 #include "clients/execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
index e41d9c58acecdf53f9a7a0ed90a4917f1ee62f23..b2ba67caef9ad91370476e4469f59198eccca678 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <stdint.h>
 
index 2026aceec9a4139ecd4a7190c256fa101597c543..c8d294f95fb14d5235aad1e43ceeb894a60f1a8e 100644 (file)
@@ -13,7 +13,7 @@
 /* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 #undef NDEBUG
 
-#include <config.h>
+#include <mem_config.h>
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
index ef2877810d92de7ef9fd6f9c04a70c52ab0321b6..92dce5d38cba2dc6d90eb591b7f9e20d28606c75 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdio>
 #include <cstring>
index 4ad0919d008a540d763cea73718c71762aa1a7fe..1551a1d50b3109d338a5d5c9ab0800b3de6f6ac9 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include "config.h"
+#include "mem_config.h"
 
 #include <cerrno>
 #include <climits>
index 5b33372838d0f788c50a822f880682f8d3e8ea7a..bcd277c23ade0b6e5e4884f96562f114cce5f2d1 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include "config.h"
+#include "mem_config.h"
 
 #include <cerrno>
 #include <cstdio>
index 910b2a6da71d2ab10462513401cd766969a6a6eb..bc9a6a75140b496b1b8dd3b3489d566d23a464d5 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
 #include <cerrno>
 #include <cstdio>
index af9a72c9766bb573e3d39442f432488875af793e..34d38936ef491eac35d67382659f307fc83ebd2d 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
index 5342d757dfa396c5b253a7a11f4017a2c555b72d..67df7c7ab5bfe4fcd871a077e7c039024f4fe47b 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
index ab4cee9eb7d72e949f97b0e3077c412d646dcb19..fc2cb0c722cedc1ff671dc5474b660764a56eae4 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdio>
 #include <cstring>
index f4fcec861a34e06d6b9701c298785c5dffd5331c..983447f1c097765a5b15f82373cff473ebc8a3a8 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
 #include <stdio.h>
 #include <unistd.h>
index 3b7f8a4b351ea72c73d6e63a4d74d7fc1a370873..a559ef90dfcef80f1bd7cb8da62aefb5f332a257 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include "config.h"
+#include "mem_config.h"
 
 #include <cstdio>
 #include <cstring>
index 777820a02f9e66d72fd1aa16543a34ca77107647..295ea0dbd74e1c2552527523549fdb9f3c55518e 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cassert>
 #include <cstdio>
index 6fd42d6c40c77305c1e58d1c3fa5010747f4da01..e50f24530e3bdf9f419e01c4df0079e833a18d7c 100644 (file)
@@ -12,7 +12,7 @@
  *          Brian Aker
  *          Toru Maesaka
  */
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdio>
 #include <cstring>
index 8bb3c78c3904ec73d31b59ba3e5e1d6f4c349893..73429e23c9f53b88a6a1021f9700f97eaa36fa6a 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdio>
 #include <cstring>
index ddc83eda82a8a42ec7bea163ec88ab5a9a6fa79c..5f5958e2a193dbe8e15fe161e2a32c10067d1e38 100644 (file)
@@ -9,7 +9,7 @@
  * Summary:
  *
  */
-#include <config.h>
+#include <mem_config.h>
 
 #include <clients/utilities.h>
 
index 90d5abdef426bf92f517149251aa36cb00900e3b..b98efaf3cd030df491fbfb5a0bee0c0a7709a322 100644 (file)
@@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests -Wno-portability subdir-objects foreign tar-u
 
 AC_PREREQ([2.61])
 
-AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
+AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS.
 AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
 
 #shared library versioning
@@ -254,17 +254,17 @@ dnl If you want to add support for other platforms you should check for
 dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add
 dnl the source file containing the implementation into memcached_SOURCE
 dnl in Makefile.am
-AC_CHECK_FUNCS([setppriv], [
-   AC_CHECK_HEADER([priv.h], [
-      AC_DEFINE([HAVE_DROP_PRIVILEGES], 1,
-         [Define this if you have an implementation of drop_privileges()])
-      build_solaris_privs=yes
-   ], [])
-],[])
-
-AC_CHECK_HEADERS_ONCE(winsock2.h poll.h sys/wait.h fnmatch.h)
-AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno")
-AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes")
+AC_CHECK_FUNCS([setppriv],
+               [AC_CHECK_HEADER([priv.h],
+                                [AC_DEFINE([HAVE_DROP_PRIVILEGES],
+                                           [1],
+                                           [Define this if you have an implementation of drop_privileges()])
+                                build_solaris_privs=yes])
+               ])
+
+AC_CHECK_HEADERS_ONCE([winsock2.h poll.h sys/wait.h fnmatch.h])
+AM_CONDITIONAL([BUILD_POLL],[test "x$ac_cv_header_poll_h" = "xno"])
+AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"])
 AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
       [AM_LDFLAGS="$AM_LDFLAGS -lws2_32"
        AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
index 5b25624a65197920ae43b13fddec892f37697856..fdfa0217d73c4024824bfdafe67c1d0068adc4c9 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <sys/types.h>
 
index 3f14c8ee17d2b1d6d5d7b2ca18e2701459d3bc66..c5385d75950e60714e7e12ca2c02e3aa474ea495 100644 (file)
@@ -23,7 +23,7 @@
  * the library)
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libmemcachedprotocol-0.0/handler.h>
 #include <libmemcached/socket.hpp>
index c5956b24c3840ab3e0b096de18178f018a195dc5..bfb78b9144f5c77d3ef02540a978daaeccb2507c 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 144235972b7a2f40be0c079ed280e67ec2c038e3..7affeb366a3f75ef138738f1ac82dbc36553cb63 100644 (file)
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <assert.h>
 #include <errno.h>
index 810886326d1c3842c4d4a85c8ff50bbf4042e6cc..53e083a433cd45f6849d4479fb5301d1a3e12734 100644 (file)
@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <mem_config.h>
 
 #ifdef __cplusplus
 # include <cstddef>
index 804bde309e7295f578dfa21076b3ff018473bee0..12d02849124263cce017a35ee6a054d2c101c22f 100644 (file)
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libmemcached/common.h>
 
index ec00877a6dfe951d3a88fb787defaaf0eac7dd12..6afd7968aca09741f88e60bedebe0c2ecc55e087 100644 (file)
@@ -38,7 +38,7 @@
 
 #pragma once
 
-#include "config.h"
+#include "mem_config.h"
 
 #include <cstddef>
 #include <cstdlib>
index 08ac787cf2838b11f2a54d9fc477aa28b09b01e4..2d662622c4bae6bf8607a26b9852ad3db4c4df8e 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <sys/time.h>
index d5e0cc72e1ad484bc7414c3789a5a4d162403320..f58378f72c3aae2e57dc8c1d0b1ec0fed10fc1ae 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 namespace libtest {
 
index dbd41ac6df19eb9a796f65649cc0fedd92856a67..a6237b3412b99fb91983d9a8e29f86f3bd1ef5eb 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libtest/blobslap_worker.h>
index ce98acb16fba7ab884d8fe71a0042e6637fbd6b8..360e38ea75cd70e16d52ce517a6261233fc878da 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 using namespace libtest;
@@ -45,6 +45,8 @@ using namespace libtest;
 #include <fcntl.h>
 #include <fstream>
 #include <memory>
+#include <poll.h>
+#include <spawn.h>
 #include <sstream>
 #include <string>
 #include <sys/stat.h>
@@ -422,8 +424,7 @@ Application::error_t Application::join()
     }
     else if WIFSIGNALED(_status)
     {
-      // memcached will die with SIGHUP
-      if (WTERMSIG(_status) != SIGTERM and WTERMSIG(_status) != SIGHUP)
+      if (WTERMSIG(_status) != SIGTERM)
       {
         _app_exit_state= Application::INVALID_POSIX_SPAWN;
         std::string error_string(built_argv[0]);
@@ -433,7 +434,7 @@ Application::error_t Application::join()
       }
 
       _app_exit_state= Application::SIGTERM_KILLED;
-      Out << "waitpid() application terminated at request"
+      Error << "waitpid() application terminated at request"
         << " pid:" << _pid 
         << " name:" << built_argv[0];
     }
index ca7098dd722343823e223cb932f6dbdead0615c5..ae4d9ba1d67751f73315277095642842d2d53ed7 100644 (file)
 
 #pragma once
 
-#ifdef HAVE_SPAWN_H
-# include <spawn.h>
-#endif
-
-/*
-  http://www.gnu.org/software/automake/manual/automake.html#Tests
-  When no test protocol is in use, an exit status of 0 from a test script will denote a success, an exit status of 77 a skipped test, an exit status of 99 an hard error, and any other exit status will denote a failure.
-*/
+#include <spawn.h>
 
+// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
 #define EXIT_SKIP 77
-#define EXIT_FATAL 99
+#define EXIT_FATAL 77
 
 #ifndef EX_NOEXEC
-# define EX_NOEXEC 126
+#  define EX_NOEXEC 126
 #endif
 
 #ifndef EX_NOTFOUND
-# define EX_NOTFOUND 127
+#  define EX_NOTFOUND 127
 #endif
 
 namespace libtest {
index 3bf571e8358b14ce4c25a2a4c6a5680eec34b295..dda1341ae1a32ddd194f502b95c156a96cce0b67 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/common.h>
 
index 20b482586402820dcf041e7e78665eb6a00575c1..6c7e294c576aac4f99c3e63e45198dc81bcf94b1 100644 (file)
 #include <string>
 
 #ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+# include <sys/types.h>
 #endif
 
 #ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+# include <sys/wait.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H 
-#include <sys/resource.h> 
+# include <sys/resource.h> 
 #endif
  
 #ifdef HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
+# include <fnmatch.h>
 #endif
 
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
 
-#ifdef HAVE_POLL_H
-# include <poll.h>
+#if defined(WIN32) || defined(__MINGW32__)
+# include "win32/wrappers.h"
+# define get_socket_errno() WSAGetLastError()
 #else
-# include "poll/poll.h"
-#endif
-
-#ifdef HAVE_SPAWN_H
-# include <spawn.h>
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+# define INVALID_SOCKET -1
+# define SOCKET_ERROR -1
+# define closesocket(a) close(a)
+# define get_socket_errno() errno
 #endif
 
 #include <libtest/test.hpp>
index 0429cde87ff5c4d7bbe2dcd042158ad2ad095d7f..c16399db7a31f3e9a5d0a1d5363cb3a1180fe49f 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 namespace libtest {
index 0ebe3efd62ca0d2bc785335c4dce54f5e0386eea..eb2ac3a1d24188ea5bb8b6885f3c13494f995491 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 
index 351ae1c05a4f9074309fa35b34557014a93ad85a..3cab0b4fc51ced9de22e40d8e4f2ba663a1fb147 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <cstdlib>
 #include <fcntl.h>
index 4643e56d25e2a2146d965dcee36a82aac70bbb27..a1844c5b41fa293957dd9980cf044779932fb614 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <unistd.h>
index 2bf094cbe8a2365fffc82ffb87d1c0f2c31c0a59..a293caa3b4319a83cf43a8adb734f7835dc2bb12 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <sys/types.h>
index 7b93513e40b1821b7cc67a400f99917b4ad8f78e..ebd8291ad474a9957051781e62b2d4a1fa03e036 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 namespace libtest {
index 49fe29699f2843984988d8c8ec56515f8afd41f6..3653eea245010016404e4bf3513d28009ac2b711 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libtest/drizzled.h>
index 3bc3755597add48a74982bfb750189806befc547..c3e3055acca010a46397107d9d3aad6d775510c1 100644 (file)
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <arpa/inet.h>
+
 namespace libtest { struct Server; }
 
 namespace libtest {
index ae79e3073f7d5498b9f23b291ca542aefc955d41..731d4998c86e2845959ebd0afa8682dc3f5087eb 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libtest/failed.h>
index 890975e6a109e3494d549ee02a5c7220d8b4025a..7178d7f95a1362d651b4261e08fbdfb108337bf0 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 #include <cstdarg>
 
index f19404d49fa9d9ff0b543cf8c04669641c1c6520..8e6b3ffb282bc089576218bec7367c735fd718be 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/common.h>
 
index 8bc6e65c234f0aff50f200c466c66b8a5b2d914e..9b351048d84cc7d53c82fd3bd1865e379aaba78b 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/common.h>
 #include <libtest/collection.h>
index c83f4eefe8a194dbd10471bdf4c9cc0528237fbc..41a73d3c38bd96cffcfd1587c04e7905813f02f7 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libtest/gearmand.h>
@@ -57,8 +57,6 @@ using namespace libtest;
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <libgearman/gearman.h>
-
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
@@ -73,37 +71,15 @@ public:
 
   bool ping()
   {
-    gearman_client_st *client= gearman_client_create(NULL);
-    if (client == NULL)
+    if (out_of_ban_killed())
     {
-      error("Could not allocate memory for gearman_client_create()");
       return false;
     }
-    gearman_client_set_timeout(client, 4000);
-
-    if (gearman_success(gearman_client_add_server(client, hostname().c_str(), port())))
-    {
-      gearman_return_t rc= gearman_client_echo(client, test_literal_param("This is my echo test"));
-
-      if (gearman_success(rc))
-      {
-        gearman_client_free(client);
-        return true;
-      }
-      
-      if (out_of_ban_killed() == false)
-      {
-        error(gearman_client_error(client));
-      }
-    }
-    else
-    {
-      error(gearman_client_error(client));
-    }
 
-    gearman_client_free(client);
+    SimpleClient client(_hostname, _port);
 
-    return false;;
+    std::string response;
+    return client.send_message("version", response);
   }
 
   const char *name()
index 9f8cf5ba6383d70f9235c3a5c59590c2f8107309..1e020a20047da1301c492dcb923ec95e302975c1 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cstdlib>
index 02d20cee2664ca627a3d2c75013fed511d209f22..59497d69760d3417f44f85d398bfc99ed69b0282 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/common.h>
 
index 5d05aa4a81a40db129025a27526a2511f3004700..b09fe364536d43027a5cfeafd54853db708201d1 100644 (file)
@@ -42,6 +42,7 @@ BUILT_SOURCES+= libtest/version.h
 clean-libtest-check:
        -rm -rf tmp_chroot
 
+noinst_HEADERS+= libtest/client.hpp
 noinst_HEADERS+= libtest/formatter.hpp
 noinst_HEADERS+= libtest/timer.hpp
 noinst_HEADERS+= libtest/alarm.h
@@ -108,6 +109,7 @@ libtest_libtest_la_SOURCES+= libtest/dream.cc
 libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
 libtest_libtest_la_SOURCES+= libtest/fatal.cc 
 libtest_libtest_la_SOURCES+= libtest/formatter.cc 
+libtest_libtest_la_SOURCES+= libtest/client.cc 
 libtest_libtest_la_SOURCES+= libtest/framework.cc 
 libtest_libtest_la_SOURCES+= libtest/has.cc 
 libtest_libtest_la_SOURCES+= libtest/http.cc 
index 7ae7b7f43760f9443fb5bb9921b034c6fbb92d53..b223dd99df93ded5a8337bbc361559ae6779a059 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 
index 5bf285c49a329451e3c422582603465200f33edf..4f8f3370cb1c04a42133f959af3516b7c6c74a89 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cstdlib>
index 64371eae3bb36e338cb6073acefbf4472b45efd9..4a7d3ceaac9daf8ed29ebaeedcb01bde3f0f035a 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 #include <string>
 
index d6c4ecbfa59e82c25cbda5802905c291c0632826..967ec71a21f319b1cd5602d262167bd4f7f7d334 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
           return EXIT_SKIP;
 
         case TEST_FAILURE:
-          std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "frame->create()" << std::endl;
+          std::cerr << "frame->create()" << std::endl;
           return EXIT_FAILURE;
         }
       }
@@ -340,27 +340,27 @@ int main(int argc, char *argv[])
   }
   catch (libtest::fatal& e)
   {
-    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "FATAL:" << e.what() << std::endl;
+    std::cerr << "FATAL:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (libtest::disconnected& e)
   {
-    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Unhandled disconnection occurred:" << e.what() << std::endl;
+    std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (std::exception& e)
   {
-    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "std::exception:" << e.what() << std::endl;
+    std::cerr << "std::exception:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (char const*)
   {
-    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Exception:" << std::endl;
+    std::cerr << "Exception:" << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (...)
   {
-    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Unknown exception halted execution." << std::endl;
+    std::cerr << "Unknown exception halted execution." << std::endl;
     exit_code= EXIT_FAILURE;
   }
 
index 37a3102eab96b448fb3db10e7abbdc2d0c90d59f..7d7920751c9bf8b66508d630a7a8c9d2f45e2cdf 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <libmemcached-1.0/memcached.h>
@@ -124,36 +124,15 @@ public:
 
   bool ping()
   {
-#if 0
-    // Memcached is slow to start, so we need to do this
-    if (pid_file().empty() == false)
+    if (out_of_ban_killed())
     {
-      if (wait_for_pidfile() == false)
-      {
-        Error << "Pidfile was not found:" << pid_file() << " :" << running();
-        return -1;
-      }
+      return false;
     }
-#endif
 
-    memcached_return_t rc;
-    bool ret;
+    SimpleClient client(_hostname, _port);
 
-    if (has_socket())
-    {
-      ret= libmemcached_util_ping(socket().c_str(), 0, &rc);
-    }
-    else
-    {
-      ret= libmemcached_util_ping(hostname().c_str(), port(), &rc);
-    }
-
-    if (memcached_failed(rc) or ret == false)
-    {
-      error(memcached_strerror(NULL, rc));
-    }
-
-    return ret;
+    std::string response;
+    return client.send_message("version", response);
   }
 
   const char *name()
index 04d4bd14f29b3d17d0cd496bf6935ccd6b1146f5..3d48a09c1ff7a0e65a8f20c4c272b570f75ba5e6 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
index 2d78369788b7751d1f9601d1580a4426792ec07b..5f1acf56aacce795bdb42d27542541a907c002ad 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 namespace libtest {
index d58b362ed5c8927f3cbb9231b4590c667e2318b0..23ea8d74a8bb8fdbdb38f4ffda96ce1f767359d3 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
index c4e7579cf8975b33838b64641f3abb1bb56fa7d9..f27ce08f7455066598b6ac333b7eef079cdcc1a9 100644 (file)
 #include <cassert>
 #include <cstdio>
 #include <cstring>
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
+#include <netdb.h>
+#include <netinet/in.h>
 #include <string>
 #include <unistd.h>
 #include <vector>
index f87a9fba126cde97070b3b1525bb19a007c63d52..79f0ad31d0ee647a686d148fd141ba1462a4177e 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
index 6eadc6d57e31416664ae11c2cabb95a595e1cf76..b8743033ed85bd98fc29468d20a36249caa24de5 100644 (file)
@@ -39,7 +39,8 @@
 #include <cassert>
 #include <cstdio>
 #include <cstring>
-
+#include <netdb.h>
+#include <netinet/in.h>
 #include <string>
 #include <unistd.h>
 #include <vector>
index 53a436be77ecbd964320fd46743809a4e49fb6f5..e680ccbc426d3b087b2cd99aed32c0663bd5a421 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <csignal>
index dae333261ce61ff0c58271a93f7af9ed864ba542..2a2ff2226ae59c1ca445636113e86974a1f6cada 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/test.hpp>
 
index 7f7037f9dda19d154a00bce8105b5f84643dbfca..667a0219a32cd113520d25b6c9ec358c1a6fea7a 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 static char global_socket[1024]= { 0 };
index 27d10365fc9299b2fbea74b73bfc2c6b443e0d5c..39108d3ca4b7f82d1014e74d58ff9d5f09bb58be 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 namespace libtest { 
index 864552fbb00904bd9a7d53dd937d8dbfdb8ffcb7..7da55bd5e1c1f141bb900af06e9777d7cf1fdc33 100644 (file)
 
 #include <cstdio>
 #include <cstdlib>
-
-#if defined(WIN32) || defined(__MINGW32__)
-# include <winsock2.h>
-# include <ws2tcpip.h>
-
-typedef short in_port_t;
-
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
+#include <arpa/inet.h>
 
 #include <libtest/visibility.h>
 #include <libtest/version.h>
@@ -90,3 +75,4 @@ typedef short in_port_t;
 #include <libtest/http.hpp>
 #include <libtest/cpu.hpp>
 #include <libtest/tmpfile.hpp>
+#include <libtest/client.hpp>
index ffa8a4b6a3cb89e6cef11ee913697bb756c5d09c..b34cb4f931ef0146eef0f3d4bc6c2536162ed9ff 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/timer.hpp>
 
index 73de26c6ac2361168cdf7974180cd32d4fa3c5e1..28ec47416766c3eb917447d527a57ef1e0e47e97 100644 (file)
@@ -114,9 +114,7 @@ public:
 private:
   void _time(struct timespec& ts)
   {
-#if defined(HAVE_CLOCK_GETTIME) && HAVE_CLOCK_GETTIME
-    clock_gettime(CLOCK_REALTIME, &ts);
-#elif defined(__MACH__) && __MACH__ // OSX lacks clock_gettime()
+#ifdef __MACH__ // OSX lacks clock_gettime()
     clock_serv_t _clock_serv;
     mach_timespec_t _mach_timespec;
     host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &_clock_serv);
@@ -125,6 +123,7 @@ private:
     ts.tv_sec= _mach_timespec.tv_sec;
     ts.tv_nsec= _mach_timespec.tv_nsec;
 #else
+    clock_gettime(CLOCK_REALTIME, &ts);
 #endif
   }
 
index a576a4a16f315a894eaeb7e63504368b91f257a1..d2457e2bd41ca16cdbf58ea3d1540095be70b5fe 100644 (file)
@@ -34,7 +34,6 @@
  *
  */
 
-#include "config.h"
 #include <libtest/common.h>
 
 namespace libtest {
index 0af3e30f8ab21977c9c7ce6c3ffbef0ae22f15b5..21081141423a5476595e115fae8d367b42697821 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 
 #include <libtest/test.hpp>
 
index 24238060df834e5685ba46bd8009a1671e9fe26f..1473509fa1383abd3bf996a7c5db46a86633953e 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 namespace libtest {
index a0d60d1f29c64f7040f66cd09c954bce26bf1bbe..a946d24607c539ebddefe8e5d2d00e1fca6747df 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include "config.h"
+#include "mem_config.h"
 
 #include <cstdlib>
 #include <fcntl.h>
index f84af7596e25759e9e55847508208793cb1cba37..c490ac2d987924fc5ca60cf3d8d6b9b9f4eed20a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * An example file showing the usage of the C++ libmemcached interface.
  */
-#include <config.h>
+#include <mem_config.h>
 
 #include <vector>
 #include <string>
index 2ec42463e20a285505b88fa428c59b7eeae1a272..a8ddc8a6fa2acf8cec73ac594aa8600403ed41cd 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index b03a0433d71d3b756ebf4460250d4183369b06db..abba57ed4718e1186f00f731d23f58890ea4cf64 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 /*
   C++ interface test
index 257a42ec643f2170c07248465b70281e088ffb81..1fb2ef2a82300712650060a0bf93d96418153a9c 100644 (file)
@@ -2,7 +2,7 @@
   C++ to libhashkit
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 
index b45be3ae86856764f62ab57dda8aa23be753f5e6..1e9ec7bd009784fdbeb44a4815cac1c446725092 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index aaa89c0a407e816dc7a4df8907ef7f146415a940..a471d89a5ab63e96024edf86599df527a874144a 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include "tests/basic.h"
index 47ab67eb407085935c437baeb5ef72f36c5b80dd..8321754d192e5c375deeac4c93747d710f8accb7 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include "tests/basic.h"
index 9b246b176d7ec8860c7e2e9fb8a90721d65b86c0..6dbd6d8cc3898c4cb2db089321ce26e3fef72300 100644 (file)
@@ -12,7 +12,7 @@
 /*
   Sample test application.
 */
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 
index 392c67782d71ccfe086c8e4d79c1860c413c61c5..715490dcffea62ec28f9843a7da1073f1b5b485e 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
index 76b0881412e074b710625c1fb24185f47ba39f0b..468ae8467571d04d84e962d4bbb214909af09803 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include "tests/libmemcached-1.0/callback_counter.h"
index 72b2f974a508d106ca082c2ef5a2fb099c065d2f..13d1b468766ce250eeb1e6b85aa6aa0a41df53ef 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <tests/callbacks.h>
index 6808089ae351e9aa7361e3cbc51e11d876d2e15a..6beccc85f12b0a76a48fb6190c3cbf42a6434083 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <climits>
index c5096ff7b6e8dcb6a490787a3db4a09aedba21bd..891a4c940698a2043750297c1e7f7629b9a83d63 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
index 27583ead3f083f1ae3876d4bd6d1756f89c0e5ff..107828d407bc06532412e4f97c523885e81d2ca0 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdlib>
 #include <climits>
index 8d3e0dbc1ab58c7012f8827112cdda31e590cba0..247075829ec57cee2a88e6ec70e4151acee2908d 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
index b5a05c77f47e8b23693a48b1c407c99ca1ac8f3a..584f4c69c2dc4de052f882b5c8248ff3a4d41a3e 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #define BUILDING_LIBMEMCACHED
index 7d1178ff8062308778d24ecb2f0240f2a7413b97..37495b0a874776bf1f36e20fb6fff38623ccd5bb 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <tests/exist.h>
index 2ce4dc2fe2aa78853332337bd4f48239314755a7..aaad9eddba62870f2b08e6aeabc5ec410bd27ee2 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <tests/libmemcached-1.0/fetch_all_results.h>
index 37f4a36eb34647ac1f321dcba7681d0167d221de..f14d2bf73ec77017be7869bcb7ac2e637e35ffcd 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcachedutil-1.0/util.h>
index a48b346a4a9e5f948942f19a016f2c623e4ed09a..cdc476abca3e43e596206e410c000914e36d663a 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include "tests/libmemcached-1.0/haldenbrand.h"
index 89d51413a33babfe67b66d88e3460635d997c47a..7aff7db8824f5ebd2c9932d1df9e524c39f0c2e6 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index de8ac905c85fae982add126fb5a536c98862bc2d..2fd726a65a175b0d54970458b85d0b68659957ff 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
index 75b2ba9062d637ebb2e3dc3ea0a28dbdffc94b85..3884ac52e5fb0b10372f67f769a2951aab73c8e8 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #if defined(HAVE_LIBUUID) && HAVE_LIBUUID
index a22393f896eef5850ec4d2615e9b9d29d335401e..c74d2ec9c69b992be6d5f07c3e3f98f2961fcf4c 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcached-1.0/memcached.h>
index 1db1a7e369c19324d31f3897f79365c97aa16deb..dc046544f893ccac9bee7dc91d0317539de30d72 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 /*
index cbe4d1b81754e3723a5d30d6476d7c2f077947e9..a1c362a9c79207309f373eae7f1c3501c0865223 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 6a75a2dc711ea8033ebe486bd43a099d804b67fa..33f95c5a6d62f52ed2e68ed809909dc4b44236bd 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index e7bfd836892f35139bc6e43fce21deacdb8cfba3..34fe7f28be8a663ab6154c90621d78abdb79c84b 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 /*
   C++ interface test
index b6653139fda1bfb5afff89d0ebb346f2995aff88..2e008d39c79231936ac362ab272e9061c96c3465 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 11125493f74a600d82200a020c3dfc209466b3ad..161223de4a977eb0f5fc411e63193b67bad35388 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 2e1808ea8acaf515a6fe420f8cd7d6bf8560684b..363eaadbcb57eb7daa72a090ab47e51d0f728cf9 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 65ce031022bb4aff5e8bb41d80747b32ae02b5e4..b85d32779cdd4594f5b35cd86c0b86a3f9639eac 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 8fd717c6a02852aee79a77c670768a5cf9dc9cd4..6539df064afd7b361bef35bf58135771a8df6437 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index ad2126fab1548d948be5728eecc6c1e24255138d..6655cb57977dc51c40292e88c95b9fc52d696e01 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 #include <libmemcachedutil-1.0/util.h>
index 605c8baace1c01c1ef40364870bc7c4303dcec9a..60318790dbf75454b34921642f3b32c242517c58 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cstdlib>
 #include <climits>
index babe1bf2ce7eb4fa99f62533e0d4578ef731acbc..25613d8f103aa3bd620575946d7937b353c8eb9f 100644 (file)
@@ -38,7 +38,7 @@
 // We let libmemcached/common.h define config since we are looking at
 // library internals.
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libmemcached-1.0/memcached.h>
 
index 07f0096f00fa112d4fcb51b080b3370825c2ff71..9bd562a2daf10923cfd4aa60cb9b61713c939d7c 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 5ed812fadb35cdca88b47c177e0466d995c2120a..a50477c9415f9de9da4fe5d0fd4661d43fd5a5df 100644 (file)
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index ed657bf4a5fd111cd6946cf81ef6bb7d6f7343d1..6e282d557d8c0ae88888092368c9eb1e72215898 100644 (file)
@@ -40,7 +40,7 @@
   Sample test application.
 */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
index 09b47efabaddc2a53e33e83f76f69607cb18cec4..d36db346cc869795c7fa5346c893db7048471d15 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index ed606d1dfbb4e8e234a0f71d04bd52fb2724e05b..abbee9e718db3f98c5b4130246f0a9a09ff64182 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 3c8d6b0238289243397322f36d021f2e4aba32ee..ef5ef0fa7abe33af80c3410a5bac92153566da59 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index e34d1b08363cba502bf8be598e6a20775a2141b9..d702ef6a50983efad4f1cc59af3f187f4e06773a 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 9b3ddd353ab9236d9097e8c12a700e6c10b9d35a..423340179adcb4763789aa5689ebb7aa6ba84e28 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 47496a645d5b8209617a8ab59db10604c86c7cd6..2c40b4371f21af2a0af4125f828e856ce7f3a58d 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 0f708a9b01eed62089c130ac777881e84669f6cd..3a3ac076d2fb4574813a38561886b44ff7d5b033 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 1f5f722ac8faf034044ddacb873d7f305225dbcc..6b2b061851cab6a9c408c1a64e9a1b832af07953 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 792d15fbcfb9b0de5cb46a73e7b659b019ab0c0c..2fd6a75f5858af5c31e77278ac0a4d0fb1abbbab 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index b2dea7e9b54e73ea1a5e574c2006cb2e541e78c7..86edee4f5c0c9a9e1d5040def3d99bfc9a1e40e6 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 207ac1dc5c45ba71471ad726b4b3be006caa8146..5293ce8e435ea3f4e526923ed71f5efa588fdf1e 100644 (file)
@@ -39,7 +39,7 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <libmemcached-1.0/memcached.h>
index 220d9ef5d8322bdfa37096d2fb7f1cc713416bde..a80c404a0bb3605b45e16bb3b8e5e105282f28d0 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 /*
   C++ interface test
index 683932973250f320f4d290366c2b5c7e55994f92..90e29efb52da2889a241a8f1a6c46214d70d6d68 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include <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 8b9f5ee94afa5da24dd60f8600868a21c131836a..a1665f36016ab0826363ff6d61d49decc7739d26 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <config.h>
+#include <mem_config.h>
 
 #include "util/instance.hpp"
 
index def31a6b060ea0873bc2f51fb07c5382448bc538..3b84a27815a71480e39b6c9f81837b390c44572e 100644 (file)
@@ -36,7 +36,7 @@
  */
 
 
-#include <config.h>
+#include <mem_config.h>
 
 #include "util/operation.hpp"
 #include <string>
index 6eda56452c753e075976bd20243670489a7a4f22..8e63016fddde41a5cd140ea27d2551b1f9ce4d2b 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <cassert>
 #include <cerrno>