projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-115
[m6w6/libmemcached]
/
libmemcached
/
memcached
/
protocol_binary.h
diff --git
a/libmemcached/memcached/protocol_binary.h
b/libmemcached/memcached/protocol_binary.h
index 4509bbcbb487efd292dcfcb6563839fb10be9652..51e2c42294848beca127ca16a64f120d55a741cc 100644
(file)
--- a/
libmemcached/memcached/protocol_binary.h
+++ b/
libmemcached/memcached/protocol_binary.h
@@
-36,7
+36,7
@@
#ifndef PROTOCOL_BINARY_H
#define PROTOCOL_BINARY_H
#ifndef PROTOCOL_BINARY_H
#define PROTOCOL_BINARY_H
-#include
"vbucket.h"
+#include
<libmemcachedprotocol-0.0/vbucket.h>
/**
* \addtogroup Protocol
/**
* \addtogroup Protocol
@@
-122,6
+122,8
@@
extern "C"
PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
PROTOCOL_BINARY_CMD_GAT = 0x1d,
PROTOCOL_BINARY_CMD_GATQ = 0x1e,
PROTOCOL_BINARY_CMD_TOUCH = 0x1c,
PROTOCOL_BINARY_CMD_GAT = 0x1d,
PROTOCOL_BINARY_CMD_GATQ = 0x1e,
+ PROTOCOL_BINARY_CMD_GATK = 0x23,
+ PROTOCOL_BINARY_CMD_GATKQ = 0x24,
PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
@@
-218,12
+220,13
@@
extern "C"
/**
* Definition of a request-packet containing no extras
*/
/**
* Definition of a request-packet containing no extras
*/
-
typedef union
{
+
union protocol_binary_request_no_extras
{
struct {
protocol_binary_request_header header;
} message;
uint8_t bytes[sizeof(protocol_binary_request_header)];
struct {
protocol_binary_request_header header;
} message;
uint8_t bytes[sizeof(protocol_binary_request_header)];
- } protocol_binary_request_no_extras;
+ };
+ typedef union protocol_binary_request_no_extras protocol_binary_request_no_extras;
/**
* Definition of a response-packet containing no extras
/**
* Definition of a response-packet containing no extras