← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to extra/libevent/evbuffer.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/libevent/evbuffer.c
43
43
#include <stdarg.h>
44
44
#endif
45
45
 
 
46
#ifdef WIN32
 
47
#include <winsock2.h>
 
48
#endif
 
49
 
 
50
#include "evutil.h"
46
51
#include "event.h"
47
52
 
48
53
/* prototypes */
56
61
        struct timeval tv, *ptv = NULL;
57
62
 
58
63
        if (timeout) {
59
 
                timerclear(&tv);
 
64
                evutil_timerclear(&tv);
60
65
                tv.tv_sec = timeout;
61
66
                ptv = &tv;
62
67
        }
288
293
 */
289
294
 
290
295
int
291
 
bufferevent_write(struct bufferevent *bufev, void *data, size_t size)
 
296
bufferevent_write(struct bufferevent *bufev, const void *data, size_t size)
292
297
{
293
298
        int res;
294
299