commit:     f5e06bc55ab1717ddff8c21f00f48cfcba8cb4a7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 18:52:21 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 18:52:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f5e06bc5

include rc.h properly in source files

We were attempting to include rc.h in rc-misc.h instead of the source
files where it should be included.

 src/includes/rc-misc.h | 1 -
 src/rc/_usage.c        | 1 +
 src/rc/checkpath.c     | 1 +
 src/rc/do_value.c      | 1 +
 src/rc/is_newer_than.c | 1 +
 src/rc/is_older_than.c | 1 +
 src/rc/swclock.c       | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h
index 9616634..f2449cd 100644
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -26,7 +26,6 @@
 #include <unistd.h>
 
 #include "helpers.h"
-#include "rc.h"
 
 #define RC_LEVEL_BOOT           "boot"
 #define RC_LEVEL_DEFAULT        "default"

diff --git a/src/rc/_usage.c b/src/rc/_usage.c
index f0c7f0f..9fc3e5d 100644
--- a/src/rc/_usage.c
+++ b/src/rc/_usage.c
@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"
 #include "version.h"

diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index c44ffe8..b150994 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 #include "rc-selinux.h"
 #include "_usage.h"

diff --git a/src/rc/do_value.c b/src/rc/do_value.c
index a511afd..e6aa3ef 100644
--- a/src/rc/do_value.c
+++ b/src/rc/do_value.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 
 const char *applet = NULL;

diff --git a/src/rc/is_newer_than.c b/src/rc/is_newer_than.c
index f1aa9d6..4093ea8 100644
--- a/src/rc/is_newer_than.c
+++ b/src/rc/is_newer_than.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "rc.h"
 #include "rc-misc.h"
 
 int main(int argc, char **argv)

diff --git a/src/rc/is_older_than.c b/src/rc/is_older_than.c
index 87d5641..aea5377 100644
--- a/src/rc/is_older_than.c
+++ b/src/rc/is_older_than.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "rc.h"
 #include "rc-misc.h"
 
 int main(int argc, char **argv)

diff --git a/src/rc/swclock.c b/src/rc/swclock.c
index 4b62a46..8245f11 100644
--- a/src/rc/swclock.c
+++ b/src/rc/swclock.c
@@ -30,6 +30,7 @@
 #include <utime.h>
 
 #include "einfo.h"
+#include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"
 

Reply via email to