mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-10 04:50:37 -04:00
Apparently MSVC lacks a ssize_t. Define an ev_ssize_t for headers, and make ssize_t work elsewhere.
svn:r1261
This commit is contained in:
parent
ebf294559e
commit
b2e8fd0e41
@ -331,4 +331,7 @@
|
|||||||
/* Define to unsigned int if you dont have it */
|
/* Define to unsigned int if you dont have it */
|
||||||
#define _EVENT_socklen_t unsigned int
|
#define _EVENT_socklen_t unsigned int
|
||||||
|
|
||||||
|
/* Define to `int' if <sys/types.h> does not define. */
|
||||||
|
#define _EVENT_ssize_t SSIZE_T
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -320,6 +320,7 @@ fi
|
|||||||
|
|
||||||
AC_TYPE_PID_T
|
AC_TYPE_PID_T
|
||||||
AC_TYPE_SIZE_T
|
AC_TYPE_SIZE_T
|
||||||
|
AC_TYPE_SSIZE_T
|
||||||
|
|
||||||
AC_CHECK_TYPES([uint64_t, uint32_t, uint16_t, uint8_t], , ,
|
AC_CHECK_TYPES([uint64_t, uint32_t, uint16_t, uint8_t], , ,
|
||||||
[#ifdef HAVE_STDINT_H
|
[#ifdef HAVE_STDINT_H
|
||||||
|
@ -80,7 +80,7 @@ struct evbuffer;
|
|||||||
modify these values except with evbuffer_ptr_set.
|
modify these values except with evbuffer_ptr_set.
|
||||||
*/
|
*/
|
||||||
struct evbuffer_ptr {
|
struct evbuffer_ptr {
|
||||||
ssize_t pos;
|
ev_ssize_t pos;
|
||||||
|
|
||||||
/* Do not alter the values of fields. */
|
/* Do not alter the values of fields. */
|
||||||
struct {
|
struct {
|
||||||
@ -379,7 +379,7 @@ int evbuffer_write(struct evbuffer *buffer, evutil_socket_t fd);
|
|||||||
@see evbuffer_read()
|
@see evbuffer_read()
|
||||||
*/
|
*/
|
||||||
int evbuffer_write_atmost(struct evbuffer *buffer, evutil_socket_t fd,
|
int evbuffer_write_atmost(struct evbuffer *buffer, evutil_socket_t fd,
|
||||||
ssize_t howmuch);
|
ev_ssize_t howmuch);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Read from a file descriptor and store the result in an evbuffer.
|
Read from a file descriptor and store the result in an evbuffer.
|
||||||
@ -537,7 +537,7 @@ void evbuffer_cb_unsuspend(struct evbuffer *buffer, struct evbuffer_cb_entry *cb
|
|||||||
@return a pointer to the contigous memory areay
|
@return a pointer to the contigous memory areay
|
||||||
*/
|
*/
|
||||||
|
|
||||||
unsigned char *evbuffer_pullup(struct evbuffer *buf, ssize_t size);
|
unsigned char *evbuffer_pullup(struct evbuffer *buf, ev_ssize_t size);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Prepends data to the beginning of the evbuffer
|
Prepends data to the beginning of the evbuffer
|
||||||
|
@ -394,7 +394,7 @@ enum bufferevent_filter_result {
|
|||||||
on an error.
|
on an error.
|
||||||
*/
|
*/
|
||||||
typedef enum bufferevent_filter_result (*bufferevent_filter_cb)(
|
typedef enum bufferevent_filter_result (*bufferevent_filter_cb)(
|
||||||
struct evbuffer *src, struct evbuffer *dst, ssize_t dst_limit,
|
struct evbuffer *src, struct evbuffer *dst, ev_ssize_t dst_limit,
|
||||||
enum bufferevent_flush_mode mode, void *ctx);
|
enum bufferevent_flush_mode mode, void *ctx);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -112,6 +112,12 @@ extern "C" {
|
|||||||
#define ev_uint8_t unsigned char
|
#define ev_uint8_t unsigned char
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _EVENT_ssize_t
|
||||||
|
#define ev_ssize_t _EVENT_ssize_t
|
||||||
|
#else
|
||||||
|
#define ev_ssize_t ssize_t
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
/** A type wide enough to hold the output of "socket()" or "accept()". On
|
/** A type wide enough to hold the output of "socket()" or "accept()". On
|
||||||
* Windows, this is an intptr_t; elsewhere, it is an int. */
|
* Windows, this is an intptr_t; elsewhere, it is an int. */
|
||||||
|
@ -40,6 +40,9 @@ extern "C" {
|
|||||||
#ifdef _EVENT___func__
|
#ifdef _EVENT___func__
|
||||||
#define __func__ _EVENT___func__
|
#define __func__ _EVENT___func__
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef _EVENT_ssize_t
|
||||||
|
#define ssize_t _EVENT_ssize_t
|
||||||
|
#endif
|
||||||
|
|
||||||
/* A good no-op to use in macro definitions. */
|
/* A good no-op to use in macro definitions. */
|
||||||
#define _EVUTIL_NIL_STMT ((void)0)
|
#define _EVUTIL_NIL_STMT ((void)0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user