1 From 3be9a4eb3a024f7adf605fe57da1491f7549c3a2 Mon Sep 17 00:00:00 2001 |
1 This is the version upstream committed to replace the patch we submitted. |
2 From: Alan Coopersmith <[email protected]> |
2 Should be included in a release after 1.31.3. |
3 Date: Sun, 20 Dec 2015 19:33:37 -0800 |
|
4 Subject: [PATCH] metadata: need to include <sys/mkdev.h> on Solaris for |
|
5 major() & minor() |
|
6 |
3 |
7 Signed-off-by: Alan Coopersmith <[email protected]> |
4 From 3424bef7ef71dc3a8c2c71310671cd6d39e7b3e7 Mon Sep 17 00:00:00 2001 |
|
5 From: Ondrej Holy <[email protected]> |
|
6 Date: Mon, 2 Jan 2017 11:31:35 +0100 |
|
7 Subject: [PATCH] metadata: Include headers for device number functionality |
|
8 |
|
9 The implicit sys/sysmacros.h (resp. sys/mkdev.h) includes via sys/types.h |
|
10 is being deprecated. Use AC_HEADER_MAJOR and include necessary header |
|
11 files for major(), minor(), and makedev() functions. |
|
12 |
|
13 https://bugzilla.gnome.org/show_bug.cgi?id=776213 |
8 --- |
14 --- |
9 configure.ac | 2 +- |
15 configure.ac | 1 + |
10 metadata/metatree.c | 4 ++++ |
16 metadata/meta-daemon.c | 6 ++++++ |
11 2 files changed, 5 insertions(+), 1 deletion(-) |
17 metadata/metatree.c | 6 ++++++ |
|
18 3 files changed, 13 insertions(+) |
12 |
19 |
13 diff --git a/configure.ac b/configure.ac |
20 diff --git a/configure.ac b/configure.ac |
14 index bb358c6..3672b00 100644 |
21 index 6fe62db..c4253b2 100644 |
15 --- a/configure.ac |
22 --- a/configure.ac |
16 +++ b/configure.ac |
23 +++ b/configure.ac |
17 @@ -772,7 +772,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) |
24 @@ -760,6 +760,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) |
18 dnl ========================================================================== |
25 dnl ========================================================================== |
19 dnl Look for various fs info getters |
26 dnl Look for various fs info getters |
20 |
27 |
21 -AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h]) |
28 +AC_HEADER_MAJOR |
22 +AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h sys/mkdev.h]) |
29 AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h]) |
23 AC_CHECK_FUNCS(statvfs statfs) |
30 AC_CHECK_FUNCS(statvfs statfs) |
24 AC_CHECK_MEMBERS([struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h> |
31 AC_CHECK_MEMBERS([struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h> |
25 #include <sys/stat.h> |
32 diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c |
|
33 index 16a7219..17402df 100644 |
|
34 --- a/metadata/meta-daemon.c |
|
35 +++ b/metadata/meta-daemon.c |
|
36 @@ -36,6 +36,12 @@ |
|
37 #include <libudev.h> |
|
38 #endif |
|
39 |
|
40 +#if MAJOR_IN_MKDEV |
|
41 +#include <sys/mkdev.h> |
|
42 +#elif MAJOR_IN_SYSMACROS |
|
43 +#include <sys/sysmacros.h> |
|
44 +#endif |
|
45 + |
|
46 #define WRITEOUT_TIMEOUT_SECS 60 |
|
47 #define WRITEOUT_TIMEOUT_SECS_NFS 15 |
|
48 |
26 diff --git a/metadata/metatree.c b/metadata/metatree.c |
49 diff --git a/metadata/metatree.c b/metadata/metatree.c |
27 index 89942cb..b5eeb36 100644 |
50 index 89942cb..0ba9dba 100644 |
28 --- a/metadata/metatree.c |
51 --- a/metadata/metatree.c |
29 +++ b/metadata/metatree.c |
52 +++ b/metadata/metatree.c |
30 @@ -9,6 +9,10 @@ |
53 @@ -18,6 +18,12 @@ |
31 #include <stdlib.h> |
54 #include "metadata-dbus.h" |
32 #include <time.h> |
55 #include "gvfsdaemonprotocol.h" |
33 |
56 |
34 +#if HAVE_SYS_MKDEV_H |
57 +#if MAJOR_IN_MKDEV |
35 +#include <sys/mkdev.h> /* needed for major() & minor() on Solaris */ |
58 +#include <sys/mkdev.h> |
|
59 +#elif MAJOR_IN_SYSMACROS |
|
60 +#include <sys/sysmacros.h> |
36 +#endif |
61 +#endif |
37 + |
62 + |
38 #include "metatree.h" |
63 #define MAGIC "\xda\x1ameta" |
39 #include "metabuilder.h" |
64 #define MAGIC_LEN 6 |
40 #include <glib.h> |
65 #define MAJOR_VERSION 1 |
41 -- |
66 -- |
42 2.6.1 |
67 2.7.4 |
43 |
68 |