projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in Adam's bug case.
[awesomized/libmemcached]
/
libmemcached
/
memcached_constants.h
diff --git
a/libmemcached/memcached_constants.h
b/libmemcached/memcached_constants.h
index c248baffa34ae09c845ee0abac147c243d104eb4..1705bb6e57883ed71f0972b6e015faa68e81051a 100644
(file)
--- a/
libmemcached/memcached_constants.h
+++ b/
libmemcached/memcached_constants.h
@@
-6,12
+6,8
@@
* Author: Brian Aker
*/
* Author: Brian Aker
*/
-#ifndef LIBMEMCACHED_MEMCACHED_CONSTANTS_H
-#define LIBMEMCACHED_MEMCACHED_CONSTANTS_H
-
-#ifndef LIBMEMCACHED_MEMCACHED_H
-#error "Please include <libmemcached/memcached.h> instead"
-#endif
+#ifndef __MEMCACHED_CONSTANTS_H__
+#define __MEMCACHED_CONSTANTS_H__
/* Public defines */
#define MEMCACHED_DEFAULT_PORT 11211
/* Public defines */
#define MEMCACHED_DEFAULT_PORT 11211
@@
-66,6
+62,7
@@
typedef enum {
MEMCACHED_INVALID_HOST_PROTOCOL,
MEMCACHED_SERVER_MARKED_DEAD,
MEMCACHED_UNKNOWN_STAT_KEY,
MEMCACHED_INVALID_HOST_PROTOCOL,
MEMCACHED_SERVER_MARKED_DEAD,
MEMCACHED_UNKNOWN_STAT_KEY,
+ MEMCACHED_E2BIG,
MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
} memcached_return;
MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
} memcached_return;
@@
-143,4
+140,4
@@
typedef enum {
MEMCACHED_CONNECTION_UNIX_SOCKET
} memcached_connection;
MEMCACHED_CONNECTION_UNIX_SOCKET
} memcached_connection;
-#endif /*
LIBMEMCACHED_MEMCACHED_CONSTANTS_H
*/
+#endif /*
__MEMCACHED_CONSTANTS_H__
*/