The branch, master has been updated via 50b0c5325e8197341c4757864bdd0b5906081916 (commit) via 29dd98be094810ce6edaa638eb76ba3138113afe (commit) from 8475d18641e407ad13b0529e788bd472018a5cc2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 50b0c5325e8197341c4757864bdd0b5906081916 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Dec 22 17:56:28 2008 +0100 Never build tevent modules as shared objects. commit 29dd98be094810ce6edaa638eb76ba3138113afe Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Dec 22 17:43:46 2008 +0100 Remove unused Samba4-specific init functions for libtevent. ----------------------------------------------------------------------- Summary of changes: lib/tevent/config.mk | 8 ++++---- lib/tevent/tevent_s4.c | 36 ------------------------------------ 2 files changed, 4 insertions(+), 40 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk index 7654f78..bce92bb 100644 --- a/lib/tevent/config.mk +++ b/lib/tevent/config.mk @@ -1,32 +1,32 @@ ############################## [MODULE::TEVENT_AIO] PRIVATE_DEPENDENCIES = LIBAIO_LINUX +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = LIBTEVENT -INIT_FUNCTION = s4_events_aio_init ############################## TEVENT_AIO_OBJ_FILES = $(libteventsrcdir)/tevent_aio.o ############################## [MODULE::TEVENT_EPOLL] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = LIBTEVENT -INIT_FUNCTION = s4_events_epoll_init ############################## TEVENT_EPOLL_OBJ_FILES = $(libteventsrcdir)/tevent_epoll.o ############################## [MODULE::TEVENT_SELECT] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = LIBTEVENT -INIT_FUNCTION = s4_events_select_init ############################## TEVENT_SELECT_OBJ_FILES = $(libteventsrcdir)/tevent_select.o ############################## [MODULE::TEVENT_STANDARD] +OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = LIBTEVENT -INIT_FUNCTION = s4_events_standard_init ############################## TEVENT_STANDARD_OBJ_FILES = $(libteventsrcdir)/tevent_standard.o diff --git a/lib/tevent/tevent_s4.c b/lib/tevent/tevent_s4.c index 4be9259..80267fd 100644 --- a/lib/tevent/tevent_s4.c +++ b/lib/tevent/tevent_s4.c @@ -20,42 +20,6 @@ #include "tevent.h" #include "tevent_internal.h" -NTSTATUS s4_events_standard_init(void) -{ - if (!events_standard_init()) { - return NT_STATUS_INTERNAL_ERROR; - } - return NT_STATUS_OK; -} - -NTSTATUS s4_events_select_init(void) -{ - if (!events_select_init()) { - return NT_STATUS_INTERNAL_ERROR; - } - return NT_STATUS_OK; -} - -#if HAVE_EVENTS_EPOLL -NTSTATUS s4_events_epoll_init(void) -{ - if (!events_epoll_init()) { - return NT_STATUS_INTERNAL_ERROR; - } - return NT_STATUS_OK; -} -#endif - -#if HAVE_LINUX_AIO -NTSTATUS s4_events_aio_init(void) -{ - if (!events_aio_init()) { - return NT_STATUS_INTERNAL_ERROR; - } - return NT_STATUS_OK; -} -#endif - /* this is used to catch debug messages from events */ -- Samba Shared Repository