[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43716] trunk/blender/extern/libmv/ third_party/glog/src: Fix build on debian ports that differs from generic i386/ x86_64 like kFreeBSD

Sergey Sharybin sergey.vfx at gmail.com
Thu Jan 26 11:36:48 CET 2012


Revision: 43716
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43716
Author:   nazgul
Date:     2012-01-26 10:36:36 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Fix build on debian ports that differs from generic i386/x86_64 like kFreeBSD

Patch by Kevin Roy, thanks!

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/glog/src/config.h
    trunk/blender/extern/libmv/third_party/glog/src/config_linux.h

Modified: trunk/blender/extern/libmv/third_party/glog/src/config.h
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/config.h	2012-01-26 09:53:58 UTC (rev 43715)
+++ trunk/blender/extern/libmv/third_party/glog/src/config.h	2012-01-26 10:36:36 UTC (rev 43716)
@@ -2,14 +2,14 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Namespace for Google classes */
-#ifdef __APPLE__
+#if defined(__APPLE__)
  #include "config_mac.h"
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #include "config_freebsd.h"
-#elif __MINGW32__
+#elif defined(__MINGW32__)
  #include "windows/config.h"
-#elif __GNUC__
+#elif defined(__linux__)
  #include "config_linux.h"
-#elif _MSC_VER
+#elif defined(_MSC_VER)
  #include "windows/config.h"
 #endif

Modified: trunk/blender/extern/libmv/third_party/glog/src/config_linux.h
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/config_linux.h	2012-01-26 09:53:58 UTC (rev 43715)
+++ trunk/blender/extern/libmv/third_party/glog/src/config_linux.h	2012-01-26 10:36:36 UTC (rev 43716)
@@ -133,8 +133,10 @@
 /* How to access the PC from a struct ucontext */
 #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
   #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
+  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
 #else
-  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
+  #undef PC_FROM_UCONTEXT
 #endif
 
 /* Define to necessary symbol if this constant uses a non-standard name on



More information about the Bf-blender-cvs mailing list