[Bf-blender-cvs] [879877295d0] blender2.8: Simplified #ifdef to not silently fail on certain platforms

Sybren A. Stüvel noreply at git.blender.org
Sun Dec 9 19:25:00 CET 2018


Commit: 879877295d0785aef0b47ebc031a06dd2f17a63f
Author: Sybren A. Stüvel
Date:   Sun Dec 9 19:24:12 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB879877295d0785aef0b47ebc031a06dd2f17a63f

Simplified #ifdef to not silently fail on certain platforms

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

M	source/blender/blenlib/intern/system.c

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

diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index c1a7846c4b1..82c42c42d9d 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -32,12 +32,12 @@
 #include "MEM_guardedalloc.h"
 
 /* for backtrace and gethostname/GetComputerName */
-#if defined(__linux__) || defined(__APPLE__)
-#  include <execinfo.h>
-#  include <unistd.h>
-#elif defined(WIN32)
+#if defined(WIN32)
 #  include <windows.h>
 #  include <dbghelp.h>
+#else
+#  include <execinfo.h>
+#  include <unistd.h>
 #endif
 
 int BLI_cpu_support_sse2(void)



More information about the Bf-blender-cvs mailing list