From 25b5a4a30f8a767bfd4577aa284bd435f7e5fb97 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 2 Oct 2010 20:03:19 -0700 Subject: Make sure events_*.c are fully compatible to callers so plugins built for a different flavour will still work. --- lib/events.h | 6 ++---- lib/events_glib.c | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/events.h b/lib/events.h index fa30cf27..66c4c6b4 100644 --- a/lib/events.h +++ b/lib/events.h @@ -80,10 +80,8 @@ G_MODULE_EXPORT gint b_input_add(int fd, b_input_condition cond, b_event_handler G_MODULE_EXPORT gint b_timeout_add(gint timeout, b_event_handler func, gpointer data); G_MODULE_EXPORT void b_event_remove(gint id); -/* For now, closesocket() is only a function when using libevent. With GLib - it's a preprocessor macro. */ -#ifdef EVENTS_LIBEVENT +/* With libevent, this one also cleans up event handlers if that wasn't already + done (the caller is expected to do so but may miss it sometimes). */ G_MODULE_EXPORT void closesocket(int fd); -#endif #endif /* _EVENTS_H_ */ diff --git a/lib/events_glib.c b/lib/events_glib.c index d6ac82cc..3fafc872 100644 --- a/lib/events_glib.c +++ b/lib/events_glib.c @@ -146,3 +146,8 @@ void b_event_remove(gint tag) if (tag > 0) g_source_remove(tag); } + +void closesocket( int fd ) +{ + close( fd ); +} -- cgit v1.2.3