diff options
| author | Jeremy Allison <jra@samba.org> | 2016-09-23 20:00:33 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2016-09-24 19:52:08 +0200 |
| commit | 4ed790ebbf474c4e4ef9b4f0f3aeca65118796df (patch) | |
| tree | 4a2b0f1b44f967fe95197f9a491a218e3e1e68b8 /source3/include | |
| parent | fbfea52e1ce8f22d8d020a2bf3aebd1bc69faceb (diff) | |
| download | samba-4ed790ebbf474c4e4ef9b4f0f3aeca65118796df.tar.gz | |
s3: events. Move events.c to util_event.c
Remove all tevent internal code.
Everything is now stock tevent.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12283
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 4 | ||||
| -rw-r--r-- | source3/include/util_event.h (renamed from source3/include/event.h) | 16 |
2 files changed, 3 insertions, 17 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 81bba40e355..234a5644ab4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -310,8 +310,8 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/dlinklist.h" #include <talloc.h> - -#include "event.h" +#include <tevent.h> +#include "util_event.h" #include "../lib/util/data_blob.h" #include "../lib/util/time.h" diff --git a/source3/include/event.h b/source3/include/util_event.h index 108026e2f5a..df608a193f9 100644 --- a/source3/include/event.h +++ b/source3/include/util_event.h @@ -18,21 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <tevent.h> - -/* The following definitions come from lib/events.c */ -struct pollfd; -struct timeval *get_timed_events_timeout(struct tevent_context *event_ctx, - struct timeval *to_ret); -void dump_event_list(struct tevent_context *event_ctx); -struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx); - -bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx, - struct pollfd **pfds, int *num_pfds, - int *ptimeout); -bool run_events_poll(struct tevent_context *ev, int pollrtn, - struct pollfd *pfds, int num_pfds); - +/* The following definitions come from lib/util_event.c */ struct idle_event *event_add_idle(struct tevent_context *event_ctx, TALLOC_CTX *mem_ctx, struct timeval interval, |