[Bf-blender-cvs] [cb694d6] master: GLog: Workaround compilation error on Hurd

Sergey Sharybin noreply at git.blender.org
Tue Nov 22 12:44:35 CET 2016


Commit: cb694d6595c78767874baf021096cc217858c85b
Author: Sergey Sharybin
Date:   Tue Nov 22 12:43:59 2016 +0100
Branches: master
https://developer.blender.org/rBcb694d6595c78767874baf021096cc217858c85b

GLog: Workaround compilation error on Hurd

There is syscall headers but no SYS_Write syscall.

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

M	extern/glog/src/raw_logging.cc

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

diff --git a/extern/glog/src/raw_logging.cc b/extern/glog/src/raw_logging.cc
index 7a7409b..8517129 100644
--- a/extern/glog/src/raw_logging.cc
+++ b/extern/glog/src/raw_logging.cc
@@ -59,7 +59,8 @@
 # include <unistd.h>
 #endif
 
-#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
+// Hurd does not have SYS_write.
+#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && !defined(__GNU__)
 # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
 #else
   // Not so safe, but what can you do?




More information about the Bf-blender-cvs mailing list