diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-06-25 19:46:30 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-06-25 19:46:30 +0000 |
| commit | ad5d33dc57b2c6ad671cbb3d4d1b6df94e01ae1d (patch) | |
| tree | 774ef9e8860d0e75acd1bef070f550c4114642d6 /lib/libevent/event.h | |
| parent | e958e63dcc43214c2ca34c72344af3601af84e55 (diff) | |
undef the timeout_*(), this is still WRONG it does allow using both event.h and sys/timeout.h in the same source (which is a valid use for both), proper fix is to rename the timeout_*() api here
Diffstat (limited to 'lib/libevent/event.h')
| -rw-r--r-- | lib/libevent/event.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libevent/event.h b/lib/libevent/event.h index 15d005a9323..1cea4492534 100644 --- a/lib/libevent/event.h +++ b/lib/libevent/event.h @@ -1,4 +1,4 @@ -/* $OpenBSD: event.h,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ +/* $OpenBSD: event.h,v 1.3 2002/06/25 19:46:29 mickey Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -127,6 +127,11 @@ int timeout_next(struct timeval *); void timeout_correct(struct timeval *); void timeout_process(void); +#undef timeout_add +#undef timeout_set +#undef timeout_del +#undef timeout_pending +#undef timeout_initialized #define timeout_add(ev, tv) event_add(ev, tv) #define timeout_set(ev, cb, arg) event_set(ev, -1, 0, cb, arg) #define timeout_del(ev) event_del(ev) |