From 3424bef7ef71dc3a8c2c71310671cd6d39e7b3e7 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Mon, 2 Jan 2017 11:31:35 +0100
Subject: metadata: Include headers for device number functionality

The implicit sys/sysmacros.h (resp. sys/mkdev.h) includes via sys/types.h
is being deprecated. Use AC_HEADER_MAJOR and include necessary header
files for major(), minor(), and makedev() functions.

https://bugzilla.gnome.org/show_bug.cgi?id=776213
---
 metadata/meta-daemon.c | 6 ++++++
 metadata/metatree.c    | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'metadata')

diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index 16a72196..17402df4 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -36,6 +36,12 @@
 #include <libudev.h>
 #endif
 
+#if MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+
 #define WRITEOUT_TIMEOUT_SECS 60
 #define WRITEOUT_TIMEOUT_SECS_NFS 15
 
diff --git a/metadata/metatree.c b/metadata/metatree.c
index 89942cb5..0ba9dbab 100644
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
@@ -18,6 +18,12 @@
 #include "metadata-dbus.h"
 #include "gvfsdaemonprotocol.h"
 
+#if MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#elif MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+
 #define MAGIC "\xda\x1ameta"
 #define MAGIC_LEN 6
 #define MAJOR_VERSION 1
-- 
cgit v1.2.1