Fixed header file layout

[awesomized/libmemcached] / libmemcached / memcached_result.h

diff --git a/libmemcached/memcached_result.h b/libmemcached/memcached_result.h
index 69daaf5e494cdd39e1aa4c0159be1a8e48b01652..77f120104ae89f9d57c3693f83761f9c8f2e8f28 100644 (file)
--- a/libmemcached/memcached_result.h
+++ b/libmemcached/memcached_result.h
@@ -6,28 +6,22 @@
  * Author: Brian Aker
  */
 
-#ifndef __MEMCACHED_RESULT_H__
-#define __MEMCACHED_RESULT_H__
+#ifndef LIBMEMCACHED_MEMCACHED_RESULT_H
+#define LIBMEMCACHED_MEMCACHED_RESULT_H
+
+#ifndef LIBMEMCACHED_MEMCACHED_H
+#error "Please include <libmemcached/memcached.h> instead"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct memcached_result_st {
-  bool is_allocated;
-  memcached_st *root;
-  char key[MEMCACHED_MAX_KEY];
-  size_t key_length;
-  memcached_string_st value;
-  uint32_t flags;
-  uint64_t cas;
-  time_t expiration;
-  /* Add result callback function */
-};
-
-/* Result Struct */
+LIBMEMCACHED_API
 void memcached_result_free(memcached_result_st *result);
+LIBMEMCACHED_API
 void memcached_result_reset(memcached_result_st *ptr);
+LIBMEMCACHED_API
 memcached_result_st *memcached_result_create(memcached_st *ptr, 
                                              memcached_result_st *result);
 #define memcached_result_key_value(A) (A)->key
@@ -37,12 +31,15 @@ memcached_result_st *memcached_result_create(memcached_st *ptr,
 #define memcached_result_value(A) memcached_string_value((A)->value)
 #define memcached_result_length(A) memcached_string_length((A)->value)
 #else
+LIBMEMCACHED_API
 char *memcached_result_value(memcached_result_st *ptr);
+LIBMEMCACHED_API
 size_t memcached_result_length(memcached_result_st *ptr);
 #endif
 #define memcached_result_flags(A) (A)->flags
 #define memcached_result_cas(A) (A)->cas
-memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length);
+LIBMEMCACHED_API
+memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length);
 #define memcached_result_set_flags(A,B) (A)->flags=(B)
 #define memcached_result_set_expiration(A,B) (A)->expiration=(B)
 
@@ -50,4 +47,4 @@ memcached_return memcached_result_set_value(memcached_result_st *ptr, char *valu
 }
 #endif
 
-#endif /* __MEMCACHED_RESULT_H__ */
+#endif /* LIBMEMCACHED_MEMCACHED_RESULT_H */