manager_inhibit_timeout_handler() can be static again.

diff --git a/src/login/elogind-dbus.h b/src/login/elogind-dbus.h
index 9e4c240be1396a1d3d5c4249296db52f9ff16101..fbcff4fc23a9b74048dca63c4822a51af08553d7 100644 (file)
--- a/src/login/elogind-dbus.h
+++ b/src/login/elogind-dbus.h
@@ -30,7 +30,6 @@ int manager_scheduled_shutdown_handler(sd_event_source *s, uint64_t usec,
 
 /* prototypes for former static functions in logind-dbus.c */
 int delay_shutdown_or_sleep(Manager *m, InhibitWhat w, HandleAction action);
-int  manager_inhibit_timeout_handler(sd_event_source *s, uint64_t usec, void *userdata);
 void reset_scheduled_shutdown(Manager *m);
 int  send_prepare_for(Manager *m, InhibitWhat w, bool _active);
 

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index c7e019de2d38e7f6cb729cd7cfa2d4f240e9994a..7ecb605af3c987d9c3f1ff9d073519b621b36e8d 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1691,11 +1691,7 @@ int manager_dispatch_delayed(Manager *manager, bool timeout) {
         return 1;
 }
 
-#if 0 /// elogind-dbus.c needs to access this
 static int manager_inhibit_timeout_handler(
-#else
-int manager_inhibit_timeout_handler(
-#endif // 0
                         sd_event_source *s,
                         uint64_t usec,
                         void *userdata) {