Refactor: lib/services: make *.h self-sufficient wrt. other includes

Also make function declaration follow the actual definitions.
beekhof · Feb 10, 2017 · 5dc4937 · 5dc4937
1 parent ef711f9
commit 5dc4937
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/lib/services/pcmk-dbus.h b/lib/services/pcmk-dbus.h
@@ -8,6 +8,8 @@
 #ifndef PCMK_DBUS__H
 #  define PCMK_DBUS__H
 
+#  include <dbus/dbus.h>
+
 #  ifndef DBUS_TIMEOUT_USE_DEFAULT
 #    define DBUS_TIMEOUT_USE_DEFAULT -1
 #  endif

diff --git a/lib/services/services_private.h b/lib/services/services_private.h
@@ -19,6 +19,9 @@
 #ifndef SERVICES_PRIVATE__H
 #  define SERVICES_PRIVATE__H
 
+#  include <glib.h>
+#  include "crm/services.h"
+
 #if SUPPORT_DBUS
 #  include <dbus/dbus.h>
 #endif

diff --git a/lib/services/systemd.h b/lib/services/systemd.h
@@ -19,8 +19,11 @@
 #ifndef SYSTEMD__H
 #  define SYSTEMD__H
 
+#  include <glib.h>
+#  include "crm/services.h"
+
 G_GNUC_INTERNAL GList *systemd_unit_listall(void);
-G_GNUC_INTERNAL int systemd_unit_exec(svc_action_t * op);
+G_GNUC_INTERNAL gboolean systemd_unit_exec(svc_action_t * op);
 G_GNUC_INTERNAL gboolean systemd_unit_exists(const gchar * name);
 G_GNUC_INTERNAL gboolean systemd_unit_running(const gchar * name);
 G_GNUC_INTERNAL void systemd_cleanup(void);

diff --git a/lib/services/upstart.h b/lib/services/upstart.h
@@ -23,7 +23,7 @@
 #  include "crm/services.h"
 
 G_GNUC_INTERNAL GList *upstart_job_listall(void);
-G_GNUC_INTERNAL int upstart_job_exec(svc_action_t * op, gboolean synchronous);
+G_GNUC_INTERNAL gboolean upstart_job_exec(svc_action_t * op, gboolean synchronous);
 G_GNUC_INTERNAL gboolean upstart_job_exists(const gchar * name);
 G_GNUC_INTERNAL gboolean upstart_job_running(const gchar * name);
 G_GNUC_INTERNAL void upstart_cleanup(void);