aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-03 06:02:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-03 06:02:16 +0000
commitc5fdef697fea27d13b6676887574e5a5036d49ab (patch)
tree702d449fc318152c00ad64ab836a56be8ae6a789
parent0f6472de756c2cedf96e00c40d97386dde94e093 (diff)
downloadruby-c5fdef697fea27d13b6676887574e5a5036d49ab.tar.gz
file.c: include sys/sysmacros.h
* file.c: include sys/sysmacros.h for ArchLinux which deprecated use of major() and minor() in sys/types.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in1
-rw-r--r--file.c4
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e0e64ae45a..6841cce638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 3 15:01:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c: include sys/sysmacros.h for ArchLinux which deprecated
+ use of major() and minor() in sys/types.h.
+
Wed Nov 2 08:45:49 2016 Dmitry Gritsay <unseductable@gmail.com>
* doc/extension.rdoc: set ANYARGS as arguments for func1 and func2.
diff --git a/configure.in b/configure.in
index 8e61066ac6..3734afae24 100644
--- a/configure.in
+++ b/configure.in
@@ -1322,6 +1322,7 @@ AC_CHECK_HEADERS(sys/select.h)
AC_CHECK_HEADERS(sys/sendfile.h)
AC_CHECK_HEADERS(sys/socket.h)
AC_CHECK_HEADERS(sys/syscall.h)
+AC_CHECK_HEADERS(sys/sysmacros.h)
AC_CHECK_HEADERS(sys/time.h)
AC_CHECK_HEADERS(sys/times.h)
AC_CHECK_HEADERS(sys/uio.h)
diff --git a/file.c b/file.c
index f86c9206d5..f11fb8228d 100644
--- a/file.c
+++ b/file.c
@@ -63,6 +63,10 @@ int flock(int, int);
#include <pwd.h>
#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>