[Debian-ha-commits] [ocfs2-tools] 02/11: debian/patches: fix makedev build warning

Valentin Vidic vvidic-guest at moszumanska.debian.org
Wed Jan 24 14:33:23 UTC 2018


This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit ce723638e766ade648b07bc3355722d8ee124cd0
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Jan 24 13:04:49 2018 +0100

    debian/patches: fix makedev build warning
---
 debian/patches/makedev.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/makedev.patch b/debian/patches/makedev.patch
new file mode 100644
index 0000000..709ac98
--- /dev/null
+++ b/debian/patches/makedev.patch
@@ -0,0 +1,26 @@
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Reviewed-by: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2018-01-24
+Subject: Use <sys/sysmacros.h> include for makedev
+ mounted.c: In function ‘build_partition_list’:
+ mounted.c:354:13: warning: In the GNU C Library, "makedev" is defined
+  by <sys/sysmacros.h>. For historical compatibility, it is
+  currently defined by <sys/types.h> as well, but we plan to
+  remove this soon. To use "makedev", include <sys/sysmacros.h>
+  directly. If you did not intend to use a system-defined macro
+  "makedev", you should undefine it after including <sys/types.h>.
+        makedev(major, minor), &devname);
+              ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/mounted.ocfs2/mounted.c
++++ b/mounted.ocfs2/mounted.c
+@@ -25,7 +25,7 @@
+ #define _LARGEFILE64_SOURCE
+ #define _GNU_SOURCE /* Because libc really doesn't want us using O_DIRECT? */
+ 
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
diff --git a/debian/patches/series b/debian/patches/series
index 19f1798..3403cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ gcc-warnings.patch
 register_printf_specifier.patch
 fortify-source.patch
 glibc-2.26.patch
+makedev.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git



More information about the Debian-HA-Commits mailing list