Merge in additional changes so that we remove a usage of std::string in the

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index e6f845eacafb01b1d877c4db92d29983f9317646..c4cd0e535d076e3f92550fa80915ed84438e6290 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -13,8 +13,7 @@
   Common include file for libmemached
 */
 
-#ifndef __LIBMEMCACHED_COMMON_H__
-#define __LIBMEMCACHED_COMMON_H__
+#pragma once
 
 #include <config.h>
 
@@ -71,6 +70,7 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
 #include "libmemcached/memcached/protocol_binary.h"
 #include "libmemcached/byteorder.h"
 #include "libmemcached/response.h"
+#include "libmemcached/prefix_key.h"
 
 /* string value */
 struct memcached_continuum_item_st
@@ -217,5 +217,3 @@ static inline void *libmemcached_calloc(const memcached_st *ptr, size_t nelem, s
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LIBMEMCACHED_COMMON_H__ */