aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-07-25 20:58:23 +0000
committerRoy Marples <roy@marples.name>2007-07-25 20:58:23 +0000
commit075e80b358b3ea10c9a66caf6dd38c4ddc89f82c (patch)
tree21ffbe2ad35c5da99b05d5a961fe0d391af29310 /src
parentaf2d9995d78c0ac019f047e235eba71e421b83cf (diff)
Merge some of reb's OpenBSD fixes in
Diffstat (limited to 'src')
-rw-r--r--src/mountinfo.c7
-rw-r--r--src/rc.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mountinfo.c b/src/mountinfo.c
index 5497875b..77fe9111 100644
--- a/src/mountinfo.c
+++ b/src/mountinfo.c
@@ -7,8 +7,11 @@
#define APPLET "mountinfo"
+#if defined(__DragonFly__) || defined(__FreeBSD__) || \
+ defined(__NetBSD__) || defined(__OpenBSD__)
+#define BSD
+
#include <sys/types.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
@@ -30,7 +33,7 @@
#include "strlist.h"
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
+#ifdef BSD
static char **find_mounts (regex_t *node_regex, regex_t *skip_node_regex,
regex_t *fstype_regex, regex_t *skip_fstype_regex,
char **mounts, bool node, bool fstype)
diff --git a/src/rc.c b/src/rc.c
index 984ac19c..9c9423cc 100644
--- a/src/rc.c
+++ b/src/rc.c
@@ -990,6 +990,7 @@ int main (int argc, char **argv)
strcmp (runlevel, RC_LEVEL_SYSINIT) == 0) &&
rc_is_env ("RC_COLDPLUG", "yes"))
{
+#if defined(__DragonFly__) || defined(__FreeBSD__)
/* The net interfaces are easy - they're all in net /dev/net :) */
start_services = rc_ls_dir (NULL, "/dev/net", 0);
STRLIST_FOREACH (start_services, service, i) {
@@ -1001,6 +1002,7 @@ int main (int argc, char **argv)
CHAR_FREE (tmp);
}
rc_strlist_free (start_services);
+#endif
/* The mice are a little more tricky.
If we coldplug anything else, we'll probably do it here. */