mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-10 04:50:37 -04:00
Merge remote-tracking branch 'github/patches-2.0'
Conflicts: test/regress.c
This commit is contained in:
commit
e0aa08666e
@ -118,7 +118,9 @@ int test_ai_eq_(const struct evutil_addrinfo *ai, const char *sockaddr_port,
|
|||||||
|
|
||||||
long timeval_msec_diff(const struct timeval *start, const struct timeval *end);
|
long timeval_msec_diff(const struct timeval *start, const struct timeval *end);
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
pid_t regress_fork(void);
|
pid_t regress_fork(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user