From: Sven Eden <yamakuzure@gmx.net>
Date: Wed, 13 Jun 2018 15:52:53 +0000 (+0200)
Subject: manager_inhibit_timeout_handler() can be static again.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=91f9a76b39dbd244ca656fdb4747380459053420;p=elogind.git

manager_inhibit_timeout_handler() can be static again.
---

diff --git a/src/login/elogind-dbus.h b/src/login/elogind-dbus.h
index 9e4c240be..fbcff4fc2 100644
--- 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 c7e019de2..7ecb605af 100644
--- 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) {