diff --git a/gevent/evbuffer.pxi b/gevent/evbuffer.pxi index 8648f1eaaff7f3b1580faba40338317854e1a964..3ba2d3351717c17d6a18912f4d6bfe766640b13b 100644 --- a/gevent/evbuffer.pxi +++ b/gevent/evbuffer.pxi @@ -13,7 +13,7 @@ cdef extern from "libevent.h": char *evbuffer_readline(evbuffer *buf) void evbuffer_free(evbuffer *buf) 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) @@ -64,7 +64,7 @@ cdef class buffer: size = min(size, length) if size <= 0: return '' - cdef char* data = <char*>evbuffer_pullup(self.__obj, size) + cdef char* data = <char*>EVBUFFER_PULLUP(self.__obj, size) if not data: try: sys.stderr.write('evbuffer_pullup(0x%x, %s) returned NULL\n' % (self._obj, size)) @@ -83,7 +83,7 @@ cdef class buffer: def readline(self, size=None): if not self.__obj: return '' - cdef char* data = <char*>evbuffer_pullup(self.__obj, -1) + cdef char* data = <char*>EVBUFFER_PULLUP(self.__obj, -1) if not data: try: sys.stderr.write('evbuffer_pullup(0x%x, -1) returned NULL\n' % (self._obj, )) diff --git a/gevent/libevent.h b/gevent/libevent.h index 48a32fac6aefba69b9da1c602df3273fd1d94a94..84d41563c3eea5b41f9c9c1f50b57ee3e310f06d 100644 --- a/gevent/libevent.h +++ b/gevent/libevent.h @@ -21,6 +21,7 @@ #define EVBUFFER_DRAIN evbuffer_drain #define EVHTTP_SET_CB evhttp_set_cb +#define EVBUFFER_PULLUP(BUF, SIZE) evbuffer_pullup(BUF, SIZE) #elif USE_LIBEVENT_1 @@ -31,7 +32,7 @@ /* compatibility */ #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_NEXT(elm, field) ((elm)->field.tqe_next)