projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated release notes
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index b9560966a5762e82a9e98cdbfd0644640b782b9d..e5dffe5b1567a206853a5335ef4fa04628b7bd4d 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-5,6
+5,8
@@
#ifndef __COMMON_H__
#define __COMMON_H__
#ifndef __COMMON_H__
#define __COMMON_H__
+#include "libmemcached/libmemcached_config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-22,6
+24,12
@@
#include <sys/un.h>
#include <netinet/tcp.h>
#include <sys/un.h>
#include <netinet/tcp.h>
+
+#include "libmemcached/memcached.h"
+#include "libmemcached/memcached_io.h"
+
+#include "libmemcached/memcached/protocol_binary.h"
+
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@
-35,12
+43,6
@@
-#include <memcached.h>
-#include "memcached_io.h"
-
-#include "memcached/protocol_binary.h"
-#include "libmemcached_config.h"
-
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#define likely(x) if((x))
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#define likely(x) if((x))
@@
-77,7
+79,8
@@
typedef enum {
MEM_BINARY_PROTOCOL= (1 << 12),
MEM_HASH_WITH_PREFIX_KEY= (1 << 13),
MEM_NOREPLY= (1 << 14),
MEM_BINARY_PROTOCOL= (1 << 12),
MEM_HASH_WITH_PREFIX_KEY= (1 << 13),
MEM_NOREPLY= (1 << 14),
- MEM_USE_UDP= (1 << 15)
+ MEM_USE_UDP= (1 << 15),
+ MEM_AUTO_EJECT_HOSTS= (1 << 16)
} memcached_flags;
/* Hashing algo */
} memcached_flags;
/* Hashing algo */