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

[awesomized/libmemcached] / libmemcached / constants.h

diff --git a/libmemcached/constants.h b/libmemcached/constants.h
index e01623c8e663680d02a54c0f0af6e0d4a5e351dd..ed588875b69a2d5c700022b1dbdb66d3cd24de76 100644 (file)
--- a/libmemcached/constants.h
+++ b/libmemcached/constants.h
@@ -30,7 +30,7 @@
 #define MEMCACHED_VERSION_STRING_LENGTH 24
 
 
-typedef enum {
+enum memcached_return_t {
   MEMCACHED_SUCCESS,
   MEMCACHED_FAILURE,
   MEMCACHED_HOST_LOOKUP_FAILURE,
@@ -77,7 +77,11 @@ typedef enum {
   MEMCACHED_PARSE_ERROR,
   MEMCACHED_PARSE_USER_ERROR,
   MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
-} memcached_return_t;
+};
+
+#ifndef __cplusplus
+typedef enum memcached_return_t memcached_return_t;
+#endif
 
 
 typedef enum {