Commit b55b4ac2 authored by Denis Bilenko's avatar Denis Bilenko

rename evbuffer_pullup to EVBUFFER_PULLUP to make it clear that it's a macro on libevent-1.4.x

parent f72fc774
...@@ -13,7 +13,7 @@ cdef extern from "libevent.h": ...@@ -13,7 +13,7 @@ cdef extern from "libevent.h":
char *evbuffer_readline(evbuffer *buf) char *evbuffer_readline(evbuffer *buf)
void evbuffer_free(evbuffer *buf) void evbuffer_free(evbuffer *buf)
size_t evbuffer_get_length(evbuffer *buffer) size_t evbuffer_get_length(evbuffer *buffer)
unsigned char *evbuffer_pullup(evbuffer *buf, size_t size) unsigned char *EVBUFFER_PULLUP(evbuffer *buf, size_t size)
int EVBUFFER_DRAIN(evbuffer *buf, size_t len) int EVBUFFER_DRAIN(evbuffer *buf, size_t len)
...@@ -64,7 +64,7 @@ cdef class buffer: ...@@ -64,7 +64,7 @@ cdef class buffer:
size = min(size, length) size = min(size, length)
if size <= 0: if size <= 0:
return '' return ''
cdef char* data = <char*>evbuffer_pullup(self.__obj, size) cdef char* data = <char*>EVBUFFER_PULLUP(self.__obj, size)
if not data: if not data:
try: try:
sys.stderr.write('evbuffer_pullup(0x%x, %s) returned NULL\n' % (self._obj, size)) sys.stderr.write('evbuffer_pullup(0x%x, %s) returned NULL\n' % (self._obj, size))
...@@ -83,7 +83,7 @@ cdef class buffer: ...@@ -83,7 +83,7 @@ cdef class buffer:
def readline(self, size=None): def readline(self, size=None):
if not self.__obj: if not self.__obj:
return '' return ''
cdef char* data = <char*>evbuffer_pullup(self.__obj, -1) cdef char* data = <char*>EVBUFFER_PULLUP(self.__obj, -1)
if not data: if not data:
try: try:
sys.stderr.write('evbuffer_pullup(0x%x, -1) returned NULL\n' % (self._obj, )) sys.stderr.write('evbuffer_pullup(0x%x, -1) returned NULL\n' % (self._obj, ))
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define EVBUFFER_DRAIN evbuffer_drain #define EVBUFFER_DRAIN evbuffer_drain
#define EVHTTP_SET_CB evhttp_set_cb #define EVHTTP_SET_CB evhttp_set_cb
#define EVBUFFER_PULLUP(BUF, SIZE) evbuffer_pullup(BUF, SIZE)
#elif USE_LIBEVENT_1 #elif USE_LIBEVENT_1
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
/* compatibility */ /* compatibility */
#define evbuffer_get_length EVBUFFER_LENGTH #define evbuffer_get_length EVBUFFER_LENGTH
#define evbuffer_pullup(BUF, SIZE) EVBUFFER_DATA(BUF) #define EVBUFFER_PULLUP(BUF, SIZE) EVBUFFER_DATA(BUF)
#define TAILQ_FIRST(head) ((head)->tqh_first) #define TAILQ_FIRST(head) ((head)->tqh_first)
#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment