[Bf-blender-cvs] [d9bb4a2] master: Fix OS X (with 10.11 SDK) glog build errors due to using deprecated code.

Brecht Van Lommel noreply at git.blender.org
Wed Dec 30 19:52:37 CET 2015


Commit: d9bb4a200c6e41baaa399993e27944f40c14bca3
Author: Brecht Van Lommel
Date:   Wed Dec 30 19:48:45 2015 +0100
Branches: master
https://developer.blender.org/rBd9bb4a200c6e41baaa399993e27944f40c14bca3

Fix OS X (with 10.11 SDK) glog build errors due to using deprecated code.

Some values are now restored to the ones from before the upgrade today.

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

M	extern/libmv/third_party/glog/src/config_mac.h

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

diff --git a/extern/libmv/third_party/glog/src/config_mac.h b/extern/libmv/third_party/glog/src/config_mac.h
index afa4262..4f008b5 100644
--- a/extern/libmv/third_party/glog/src/config_mac.h
+++ b/extern/libmv/third_party/glog/src/config_mac.h
@@ -86,7 +86,7 @@
 #define HAVE_STRING_H
 
 /* Define to 1 if you have the <syscall.h> header file. */
-#define HAVE_SYSCALL_H
+/* #undef HAVE_SYSCALL_H */
 
 /* Define to 1 if you have the <syslog.h> header file. */
 #define HAVE_SYSLOG_H
@@ -104,13 +104,13 @@
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/ucontext.h> header file. */
-/* #undef HAVE_SYS_UCONTEXT_H */
+#define HAVE_SYS_UCONTEXT_H 1
 
 /* Define to 1 if you have the <sys/utsname.h> header file. */
 #define HAVE_SYS_UTSNAME_H
 
 /* Define to 1 if you have the <ucontext.h> header file. */
-#define HAVE_UCONTEXT_H
+/* #undef HAVE_UCONTEXT_H */
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1




More information about the Bf-blender-cvs mailing list