Changeset 25b5a4a

Timestamp:

2010-10-03T03:03:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

508588a

Parents:

04f0c10

Message:

Make sure events_*.c are fully compatible to callers so plugins built for
a different flavour will still work.

Files:

• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (1 diff)
• sock.h (modified) (1 diff)

lib/events.h

@@ -81 +81 @@
 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_ */

lib/events_glib.c

@@ -147 +147 @@
                 g_source_remove(tag);
 }
+
+void closesocket( int fd )
+{
+        close( fd );
+}

sock.h

@@ -11 +11 @@
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
-#ifndef EVENTS_LIBEVENT
-#define closesocket(a) close(a)
-#else
 void closesocket( int fd );
-#endif
 #else
 # include <winsock2.h>