chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmod: move #ifdef checks for kmod-setup out of main.c into kmod-setup.c
[elogind.git]
/
src
/
core
/
kmod-setup.c
diff --git
a/src/core/kmod-setup.c
b/src/core/kmod-setup.c
index 8136d3c0f809b681808451e6d92cc5263dc9dead..23df1fdf36d12569a291e24aa0950a1785c40333 100644
(file)
--- a/
src/core/kmod-setup.c
+++ b/
src/core/kmod-setup.c
@@
-23,13
+23,17
@@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
+
+#ifdef HAVE_KMOD
#include <libkmod.h>
#include <libkmod.h>
+#endif
#include "macro.h"
#include "execute.h"
#include "capability.h"
#include "kmod-setup.h"
#include "macro.h"
#include "execute.h"
#include "capability.h"
#include "kmod-setup.h"
+#ifdef HAVE_KMOD
static void systemd_kmod_log(
void *data,
int priority,
static void systemd_kmod_log(
void *data,
int priority,
@@
-52,8
+56,10
@@
static bool cmdline_check_kdbus(void) {
return strstr(line, "kdbus") != NULL;
}
return strstr(line, "kdbus") != NULL;
}
+#endif
int kmod_setup(void) {
int kmod_setup(void) {
+#ifdef HAVE_KMOD
static const struct {
const char *module;
static const struct {
const char *module;
@@
-123,5
+129,6
@@
int kmod_setup(void) {
if (ctx)
kmod_unref(ctx);
if (ctx)
kmod_unref(ctx);
+#endif
return 0;
}
return 0;
}