projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge up for version.
[awesomized/libmemcached]
/
libmemcached
/
io.h
diff --git
a/libmemcached/io.h
b/libmemcached/io.h
index 85d56b16d70539e93fede37a7cabcc230488566a..0d1e6193c3839945b7a0c1a4981229698f28d920 100644
(file)
--- a/
libmemcached/io.h
+++ b/
libmemcached/io.h
@@
-36,12
+36,9
@@
*
*/
*
*/
-#ifndef __LIBMEMCACHED_IO_H__
-#define __LIBMEMCACHED_IO_H__
+#pragma once
-#if defined(BUILDING_LIBMEMCACHED)
-
-#include "libmemcached/memcached.h"
+#include <libmemcached/memcached.h>
#define MAX_UDP_DATAGRAM_LENGTH 1400
#define UDP_DATAGRAM_HEADER_LENGTH 8
#define MAX_UDP_DATAGRAM_LENGTH 1400
#define UDP_DATAGRAM_HEADER_LENGTH 8
@@
-99,7
+96,7
@@
memcached_return_t memcached_io_readline(memcached_server_write_instance_st ptr,
size_t size);
LIBMEMCACHED_LOCAL
size_t size);
LIBMEMCACHED_LOCAL
-
memcached_return_t
memcached_io_close(memcached_server_write_instance_st ptr);
+
void
memcached_io_close(memcached_server_write_instance_st ptr);
/* Read n bytes of data from the server and store them in dta */
LIBMEMCACHED_LOCAL
/* Read n bytes of data from the server and store them in dta */
LIBMEMCACHED_LOCAL
@@
-114,10
+111,9
@@
memcached_return_t memcached_io_init_udp_header(memcached_server_write_instance_
LIBMEMCACHED_LOCAL
memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st *memc);
LIBMEMCACHED_LOCAL
memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st *memc);
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_io_slurp(memcached_server_write_instance_st ptr);
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
-
-#endif /* BUILDING_LIBMEMCACHED */
-
-#endif /* __LIBMEMCACHED_IO_H__ */