Cleanup tests to be more independent of distribution type.

[m6w6/libmemcached] / tests / error_conditions.cc

diff --git a/tests/error_conditions.cc b/tests/error_conditions.cc
index b46b3ca28bab3dff9df2f605daad5aac36df7c06..66e7c44e02534b085c368791647c2cca6b005aa1 100644 (file)
--- a/tests/error_conditions.cc
+++ b/tests/error_conditions.cc
@@ -36,35 +36,29 @@
  */
 
 #include <config.h>
+#include <libtest/test.hpp>
+
+#define BUILDING_LIBMEMCACHED
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/is.h>
-#include <libtest/test.h>
-#include <tests/error_conditions.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <tests/error_conditions.h>
 
-test_return_t memcached_increment_MEMCACHED_NO_SERVERS(memcached_st *junk)
+test_return_t memcached_increment_MEMCACHED_NO_SERVERS(memcached_st *)
 {
-  (void)junk;
   memcached_st *memc_ptr;
 
   memc_ptr= memcached_create(NULL);
   test_true(memc_ptr);
 
-  memcached_increment(memc_ptr, memcached_string_with_size("dead key"), 1, NULL);
+  memcached_increment(memc_ptr, test_literal_param("dead key"), 1, NULL);
   test_true(memcached_last_error(memc_ptr) == MEMCACHED_NO_SERVERS);
 
-  memcached_increment(memc_ptr, memcached_string_with_size("dead key"), 1, NULL);
+  memcached_increment(memc_ptr, test_literal_param("dead key"), 1, NULL);
   test_true(memcached_last_error(memc_ptr) == MEMCACHED_NO_SERVERS);
 
   memcached_free(memc_ptr);
 
   return TEST_SUCCESS;
 }
-
-#ifdef __cplusplus
-}
-#endif