Merge branch 'blender2.7'

2019-02-11 15:25:46 +01:00 · 2019-02-11 15:25:46 +01:00 · b8d4f06b10
parent 3117446967 9359200956
commit b8d4f06b10
1 changed files with 1 additions and 0 deletions
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@ -28,6 +28,7 @@
 #  endif
 #  include "util_windows.h"
 #elif defined(__APPLE__)
+#  include <sys/ioctl.h>
 #  include <sys/sysctl.h>
 #  include <sys/types.h>
 #else