From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 7 Mar 2018 10:32:02 +0000 (+0100)
Subject: krbd: include sys/sysmacros.h for major, minor and makedev
X-Git-Tag: v13.0.2~61^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbc97f5565ae2d10c676ad483dbb5d3b32b98bea;p=ceph.git

krbd: include sys/sysmacros.h for major, minor and makedev

Previously we got these through sys/types.h, but that's now deprecated:

  warning: In the GNU C Library, "major" 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 "major", include <sys/sysmacros.h>
   directly. If you did not intend to use a system-defined macro
   "major", you should undefine it after including <sys/types.h>.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/krbd.cc b/src/krbd.cc
index cdc45e7dddcf..27b33b2855ae 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <string>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <unistd.h>