Merge in Adam's bug case.

[awesomized/libmemcached] / libmemcached / memcached_result.h

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 77f120104ae89f9d57c3693f83761f9c8f2e8f28..e7ce012b3884e814e50b065c496b00b00c0e91b6 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -6,17 +6,26 @@
  * Author: Brian Aker
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_RESULT_H
-#define LIBMEMCACHED_MEMCACHED_RESULT_H
-
-#ifndef LIBMEMCACHED_MEMCACHED_H
-#error "Please include <libmemcached/memcached.h> instead"
-#endif
+#ifndef __MEMCACHED_RESULT_H__
+#define __MEMCACHED_RESULT_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct memcached_result_st {
+  uint32_t flags;
+  bool is_allocated;
+  time_t expiration;
+  memcached_st *root;
+  size_t key_length;
+  uint64_t cas;
+  memcached_string_st value;
+  char key[MEMCACHED_MAX_KEY];
+  /* Add result callback function */
+};
+
+/* Result Struct */
 LIBMEMCACHED_API
 void memcached_result_free(memcached_result_st *result);
 LIBMEMCACHED_API
@@ -47,4 +56,4 @@ memcached_return memcached_result_set_value(memcached_result_st *ptr, const char
 }
 #endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_RESULT_H */
+#endif /* __MEMCACHED_RESULT_H__ */