projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'seehuhn/1.1' into 1.1
[tinc]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index
f349742
..
60d357d
100644
(file)
--- a/
src/event.c
+++ b/
src/event.c
@@
-91,8
+91,8
@@
void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags) {
#ifdef HAVE_MINGW
void io_add_event(io_t *io, io_cb_t cb, void *data, WSAEVENT event) {
#ifdef HAVE_MINGW
void io_add_event(io_t *io, io_cb_t cb, void *data, WSAEVENT event) {
- io_add(io, cb, data, -1, 0);
io->event = event;
io->event = event;
+ io_add(io, cb, data, -1, 0);
}
#endif
}
#endif
@@
-256,10
+256,10
@@
bool event_loop(void) {
fd_set writable;
while(running) {
fd_set writable;
while(running) {
- memcpy(&readable, &readfds, sizeof readable);
- memcpy(&writable, &writefds, sizeof writable);
struct timeval diff;
struct timeval *tv = get_time_remaining(&diff);
struct timeval diff;
struct timeval *tv = get_time_remaining(&diff);
+ memcpy(&readable, &readfds, sizeof readable);
+ memcpy(&writable, &writefds, sizeof writable);
int fds = 0;
int fds = 0;