temporary ifdef libsystemd

Signed-off-by: Khang D Nguyen <[email protected]>

Author: khangng-ampere

meson.build

@@ -60,12 +60,13 @@ toml_dep = declare_dependency(
 executable('mctp',
     sources: ['src/mctp.c'] + netlink_sources + util_sources + ops_sources,
     install: true,
+    c_args: ['-DHAVE_LIBSYSTEMD=0'],
 )
 
 mctp_test = executable('test-mctp',
     sources: ['src/mctp.c'] + netlink_sources + util_sources + test_ops_sources,
     include_directories:  include_directories('src'),
-    dependencies: [libsystemd],
+    c_args: ['-DHAVE_LIBSYSTEMD=0'],
 )
 
 executable('mctp-req',
@@ -93,6 +94,7 @@ if libsystemd.found()
         dependencies: [libsystemd, toml_dep],
         install: true,
         install_dir: get_option('sbindir'),
+        c_args: ['-DHAVE_LIBSYSTEMD=1'],
     )
 
     mctpd_test = executable('test-mctpd',
@@ -101,6 +103,7 @@ if libsystemd.found()
         ] + test_ops_sources + netlink_sources + util_sources,
         include_directories:  include_directories('src'),
         dependencies: [libsystemd, toml_dep],
+        c_args: ['-DHAVE_LIBSYSTEMD=1'],
     )
 endif
 

src/mctp-ops.c

@@ -9,7 +9,9 @@
 
 #include <unistd.h>
 #include <linux/netlink.h>
+#if HAVE_LIBSYSTEMD
 #include <systemd/sd-event.h>
+#endif
 #include <err.h>
 
 #include "mctp.h"
@@ -75,10 +77,12 @@ const struct mctp_ops mctp_ops = {
 		.recvfrom = mctp_op_recvfrom,
 		.close = mctp_op_close,
 	},
+#if HAVE_LIBSYSTEMD
 	.sd_event = {
 		.add_time_relative = sd_event_add_time_relative,
 		.source_set_time_relative = sd_event_source_set_time_relative,
 	},
+#endif
 	.bug_warn = mctp_bug_warn,
 };
 

src/mctp-ops.h

@@ -10,7 +10,6 @@
 #include <stdint.h>
 #include <sys/socket.h>
 #include <stdarg.h>
-#include <systemd/sd-event.h>
 
 #define _GNU_SOURCE
 
@@ -26,13 +25,17 @@ struct socket_ops {
 	int (*close)(int sd);
 };
 
+struct sd_event;
+struct sd_event_source;
 struct sd_event_ops {
-	int (*add_time_relative)(sd_event *e, sd_event_source **ret,
-				 clockid_t clock, uint64_t usec,
-				 uint64_t accuracy,
-				 sd_event_time_handler_t callback,
+	int (*add_time_relative)(struct sd_event *e,
+				 struct sd_event_source **ret, clockid_t clock,
+				 uint64_t usec, uint64_t accuracy,
+				 int (*callback)(struct sd_event_source *s,
+						 uint64_t usec, void *userdata),
 				 void *userdata);
-	int (*source_set_time_relative)(sd_event_source *s, uint64_t usec);
+	int (*source_set_time_relative)(struct sd_event_source *s,
+					uint64_t usec);
 };
 
 struct mctp_ops {

tests/mctp-ops-test.c

@@ -19,7 +19,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#if HAVE_LIBSYSTEMD
 #include <systemd/sd-event.h>
+#endif
 #include <linux/netlink.h>
 
 #include "mctp-ops.h"
@@ -225,6 +227,7 @@ static void mctp_bug_warn(const char *fmt, va_list args)
 	abort();
 }
 
+#if HAVE_LIBSYSTEMD
 struct wrapped_time_userdata {
 	sd_event_time_handler_t callback;
 	void *userdata;
@@ -331,6 +334,7 @@ static int mctp_op_sd_event_source_set_time_relative(sd_event_source *s,
 
 	return 0;
 }
+#endif
 
 const struct mctp_ops mctp_ops = {
 	.mctp = {
@@ -349,10 +353,12 @@ const struct mctp_ops mctp_ops = {
 		.recvfrom = mctp_op_recvfrom,
 		.close = mctp_op_close,
 	},
+#if HAVE_LIBSYSTEMD
 	.sd_event = {
 	    .add_time_relative = mctp_op_sd_event_add_time_relative,
 		.source_set_time_relative = mctp_op_sd_event_source_set_time_relative,
 	},
+#endif
 	.bug_warn = mctp_bug_warn,
 };