From 1bd0107c54953f0f2512e6c7f6d10fb93b299c9e Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Thu, 9 May 2019 15:15:30 -0700
Subject: [PATCH] build: fix various includes for older GCC

---
 src/helpers.c                                   | 1 +
 src/libsysprof-ui/sysprof-mark-visualizer-row.c | 2 ++
 src/libsysprof/sysprof-hostinfo-source.c        | 1 +
 src/libsysprof/sysprof-memory-source.c          | 1 +
 src/libsysprof/sysprof-perf-source.c            | 3 ++-
 src/sysprofd/meson.build                        | 1 -
 src/sysprofd/sysprofd.c                         | 1 +
 src/tests/test-capture.c                        | 1 +
 8 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/helpers.c b/src/helpers.c
index 17de7aac..7b14010b 100644
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -27,6 +27,7 @@
 # include <linux/perf_event.h>
 # include <sys/syscall.h>
 #endif
+#include <string.h>
 #include <unistd.h>
 
 #include "helpers.h"
diff --git a/src/libsysprof-ui/sysprof-mark-visualizer-row.c b/src/libsysprof-ui/sysprof-mark-visualizer-row.c
index d773657c..ba71a88c 100644
--- a/src/libsysprof-ui/sysprof-mark-visualizer-row.c
+++ b/src/libsysprof-ui/sysprof-mark-visualizer-row.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include "sysprof-capture-condition.h"
 #include "sysprof-capture-cursor.h"
 #include "rectangles.h"
diff --git a/src/libsysprof/sysprof-hostinfo-source.c b/src/libsysprof/sysprof-hostinfo-source.c
index b0a15043..05babcbb 100644
--- a/src/libsysprof/sysprof-hostinfo-source.c
+++ b/src/libsysprof/sysprof-hostinfo-source.c
@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/libsysprof/sysprof-memory-source.c b/src/libsysprof/sysprof-memory-source.c
index 0aa79e2a..cf5b736f 100644
--- a/src/libsysprof/sysprof-memory-source.c
+++ b/src/libsysprof/sysprof-memory-source.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <sysprof-capture.h>
 #include <unistd.h>
 
diff --git a/src/libsysprof/sysprof-perf-source.c b/src/libsysprof/sysprof-perf-source.c
index 5ec52786..2648259e 100644
--- a/src/libsysprof/sysprof-perf-source.c
+++ b/src/libsysprof/sysprof-perf-source.c
@@ -42,6 +42,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -429,7 +430,7 @@ sysprof_perf_get_tracepoint_config (const char *path, gint64 *config)
 
   g_free(filename);
 
-  *config = strtoull(contents, NULL, 0);
+  *config = strtoull (contents, NULL, 0);
 
   g_free (contents);
 
diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build
index 4fb195f1..038ea769 100644
--- a/src/sysprofd/meson.build
+++ b/src/sysprofd/meson.build
@@ -10,7 +10,6 @@ sysprofd_sources = [
 pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
 
 sysprofd_deps = [
-  dependency('libsystemd', version: '>=222'),
   dependency('glib-2.0', version: glib_req_version),
   dependency('gio-2.0', version: glib_req_version),
   dependency('gio-unix-2.0', version: glib_req_version),
diff --git a/src/sysprofd/sysprofd.c b/src/sysprofd/sysprofd.c
index fc944582..9734f4cd 100644
--- a/src/sysprofd/sysprofd.c
+++ b/src/sysprofd/sysprofd.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <stdlib.h>
 
 #include "ipc-service.h"
 #include "ipc-service-impl.h"
diff --git a/src/tests/test-capture.c b/src/tests/test-capture.c
index 00f468ed..5af92ba6 100644
--- a/src/tests/test-capture.c
+++ b/src/tests/test-capture.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <glib/gstdio.h>
+#include <string.h>
 #include <sysprof-capture.h>
 
 static void