Merge trond from lp:~trond-norbye/libmemcached/bug_396882

[awesomized/libmemcached] / libmemcached / memcached / protocol_binary.h

diff --git a/libmemcached/memcached/protocol_binary.h b/libmemcached/memcached/protocol_binary.h
index 9d225144d9bfa6f195b77eedb6d9e527e74d47e1..7a59ade32a268593e62b4bc3ddabb929ecdec61c 100644 (file)
--- a/libmemcached/memcached/protocol_binary.h
+++ b/libmemcached/memcached/protocol_binary.h
@@ -32,8 +32,10 @@
  * Author: Trond Norbye <trond.norbye@sun.com>
  */
 
-#ifndef PROTOCOL_BINARY_H
-#define PROTOCOL_BINARY_H
+#ifndef LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H
+#define LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H
+
+#if defined(BUILDING_LIBMEMCACHED)
 
 #include <stdint.h>
 
@@ -54,7 +56,7 @@ extern "C"
    */
   typedef enum {
     PROTOCOL_BINARY_REQ = 0x80,
-    PROTOCOL_BINARY_RES = 0x81,
+    PROTOCOL_BINARY_RES = 0x81
   } protocol_binary_magic;
 
   /**
@@ -69,7 +71,7 @@ extern "C"
     PROTOCOL_BINARY_RESPONSE_EINVAL = 0x04,
     PROTOCOL_BINARY_RESPONSE_NOT_STORED = 0x05,
     PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
-    PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82,
+    PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82
   } protocol_binary_response_status;
 
   /**
@@ -93,7 +95,17 @@ extern "C"
     PROTOCOL_BINARY_CMD_GETKQ = 0x0d,
     PROTOCOL_BINARY_CMD_APPEND = 0x0e,
     PROTOCOL_BINARY_CMD_PREPEND = 0x0f,
-    PROTOCOL_BINARY_CMD_STAT    = 0x10,
+    PROTOCOL_BINARY_CMD_STAT = 0x10,
+    PROTOCOL_BINARY_CMD_SETQ = 0x11,
+    PROTOCOL_BINARY_CMD_ADDQ = 0x12,
+    PROTOCOL_BINARY_CMD_REPLACEQ = 0x13,
+    PROTOCOL_BINARY_CMD_DELETEQ = 0x14,
+    PROTOCOL_BINARY_CMD_INCREMENTQ = 0x15,
+    PROTOCOL_BINARY_CMD_DECREMENTQ = 0x16,
+    PROTOCOL_BINARY_CMD_QUITQ = 0x17,
+    PROTOCOL_BINARY_CMD_FLUSHQ = 0x18,
+    PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
+    PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a
   } protocol_binary_command;
 
   /**
@@ -101,7 +113,7 @@ extern "C"
    * See section 3.4 Data Types
    */
   typedef enum {
-    PROTOCOL_BINARY_RAW_BYTES = 0x00,
+    PROTOCOL_BINARY_RAW_BYTES = 0x00
   } protocol_binary_datatypes;
 
   /**
@@ -259,7 +271,7 @@ extern "C"
    * Definition of the packet returned by the noop command
    * See section 4
    */
-  typedef protocol_binary_response_no_extras protocol_binary_response_nnoop;
+  typedef protocol_binary_response_no_extras protocol_binary_response_noop;
 
   /**
    * Definition of the structure used by the increment and decrement
@@ -348,4 +360,6 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-#endif /* PROTOCOL_BINARY_H */
+
+#endif /* BUILDING_LIBMEMCACHED */
+#endif /* LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H */