[Bf-blender-cvs] [65bb121] master: Fix compilation on OSX after own rB414c70435dcd...

Bastien Montagne noreply at git.blender.org
Tue Jun 24 08:33:16 CEST 2014


Commit: 65bb121401300ffeda6539ddbdef44f2312ab074
Author: Bastien Montagne
Date:   Tue Jun 24 08:31:29 2014 +0200
https://developer.blender.org/rB65bb121401300ffeda6539ddbdef44f2312ab074

Fix compilation on OSX after own rB414c70435dcd...

Sigh, why can't all unix have same includes? :/

===================================================================

M	source/blender/blenlib/intern/fileops.c
M	source/blender/blenlib/intern/path_util.c

===================================================================

diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 6123553..6f65847 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -52,7 +52,6 @@
 #  include "utf_winfunc.h"
 #  include "utfconv.h"
 #else
-#  include <unistd.h> // for read close
 #  include <sys/param.h>
 #  include <dirent.h>
 #  include <unistd.h>
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index d95cb5e..0b89ec1 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -66,6 +66,7 @@
 #  ifdef WITH_BINRELOC
 #    include "binreloc.h"
 #  endif
+#  include <unistd.h>  /* mkdtemp on OSX (and probably all *BSD?), not worth making specific check for this OS. */
 #endif /* WIN32 */
 
 /* local */




More information about the Bf-blender-cvs mailing list