From c8a8806e7705cb2e465b6727415c955fd5ef194b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Nov 2013 03:20:40 +0100 Subject: build-sys: merge sd-event into sd-bus The sd-event APIs should be available only as part of libsystemd-bus so that the utility calls are not linked into each independently and we can minimize the number of libraries we have. --- src/libsystemd-bus/libsystemd-bus.sym | 50 ++++++++++++++++++++++++++++- src/libsystemd-bus/libsystemd-event.sym | 57 --------------------------------- 2 files changed, 49 insertions(+), 58 deletions(-) delete mode 100644 src/libsystemd-bus/libsystemd-event.sym (limited to 'src/libsystemd-bus') diff --git a/src/libsystemd-bus/libsystemd-bus.sym b/src/libsystemd-bus/libsystemd-bus.sym index 850f370c5b..5eecfa1cf9 100644 --- a/src/libsystemd-bus/libsystemd-bus.sym +++ b/src/libsystemd-bus/libsystemd-bus.sym @@ -178,7 +178,7 @@ global: sd_bus_error_is_set; sd_bus_error_has_name; - /* mem-fd functions */ + /* sd-memfd functions */ sd_memfd_new; sd_memfd_make; sd_memfd_new_and_map; @@ -192,6 +192,54 @@ global: sd_memfd_get_size; sd_memfd_set_size; + /* sd-event functions */ + sd_event_new; + sd_event_ref; + sd_event_unref; + + sd_event_add_io; + sd_event_add_monotonic; + sd_event_add_realtime; + sd_event_add_signal; + sd_event_add_child; + sd_event_add_defer; + sd_event_add_quit; + + sd_event_run; + sd_event_loop; + + sd_event_get_state; + sd_event_get_quit; + sd_event_request_quit; + sd_event_get_now_realtime; + sd_event_get_now_monotonic; + sd_event_get; + + sd_event_source_ref; + sd_event_source_unref; + + sd_event_source_set_prepare; + sd_event_source_get_pending; + sd_event_source_get_priority; + sd_event_source_set_priority; + sd_event_source_get_enabled; + sd_event_source_set_enabled; + sd_event_source_get_userdata; + sd_event_source_get_io_fd; + sd_event_source_get_io_events; + sd_event_source_set_io_events; + sd_event_source_get_io_revents; + sd_event_source_get_time; + sd_event_source_set_time; + sd_event_source_set_time_accuracy; + sd_event_source_get_time_accuracy; + sd_event_source_get_signal; + sd_event_source_get_child_pid; + + /* sd-utf8 function */ + sd_utf8_is_valid; + sd_ascii_is_valid; + local: *; }; diff --git a/src/libsystemd-bus/libsystemd-event.sym b/src/libsystemd-bus/libsystemd-event.sym deleted file mode 100644 index d5b47ced73..0000000000 --- a/src/libsystemd-bus/libsystemd-event.sym +++ /dev/null @@ -1,57 +0,0 @@ -/*** - This file is part of systemd. - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. -***/ - -LIBSYSTEMD_EVENT_209 { -global: - sd_event_new; - sd_event_ref; - sd_event_unref; - - sd_event_add_io; - sd_event_add_monotonic; - sd_event_add_realtime; - sd_event_add_signal; - sd_event_add_child; - sd_event_add_defer; - sd_event_add_quit; - - sd_event_run; - sd_event_loop; - - sd_event_get_state; - sd_event_get_quit; - sd_event_request_quit; - sd_event_get_now_realtime; - sd_event_get_now_monotonic; - sd_event_get; - - sd_event_source_ref; - sd_event_source_unref; - - sd_event_source_set_prepare; - sd_event_source_get_pending; - sd_event_source_get_priority; - sd_event_source_set_priority; - sd_event_source_get_enabled; - sd_event_source_set_enabled; - sd_event_source_get_userdata; - sd_event_source_get_io_fd; - sd_event_source_get_io_events; - sd_event_source_set_io_events; - sd_event_source_get_io_revents; - sd_event_source_get_time; - sd_event_source_set_time; - sd_event_source_set_time_accuracy; - sd_event_source_get_time_accuracy; - sd_event_source_get_signal; - sd_event_source_get_child_pid; - -local: - *; -}; -- cgit v1.2.3-54-g00ecf