diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-11 17:25:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-11 17:25:46 +0300 |
| commit | b8d4f06b102d9bc3e4b1cf9fe57b9e6dd0a3d961 (patch) | |
| tree | 9a6103d6e323f310b44d25297b250cfd6ddcf6fb /intern | |
| parent | 311744696727915b34ef8dca4d8f40d71c4d469d (diff) | |
| parent | 93592009562f6c5cd18035c4562a11a50ec25dc8 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_system.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index 6255596cd06..fc6db1f6662 100644 --- 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 |