[Bf-blender-cvs] [29c0cff] master: Fix/workaround compilation error in dds

Sergey Sharybin noreply at git.blender.org
Fri Feb 12 20:17:37 CET 2016


Commit: 29c0cff680efe3445870acc82591ba881ea1df1c
Author: Sergey Sharybin
Date:   Fri Feb 12 20:14:39 2016 +0100
Branches: master
https://developer.blender.org/rB29c0cff680efe3445870acc82591ba881ea1df1c

Fix/workaround compilation error in dds

CLAMP was conflicting between Common.h and BLI_utildefines.h

Ideally we would use macro from BLI, but it's a bit involved change
to make it working with C++, will keep it for later.

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

M	source/blender/imbuf/intern/dds/dds_api.cpp

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

diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index c963609..12e03f5 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -25,6 +25,10 @@
  */
 
 
+extern "C" {
+#include "BLI_utildefines.h"
+}
+
 #include <stddef.h>
 #include <dds_api.h>
 #include <Stream.h>




More information about the Bf-blender-cvs mailing list