Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-12 22:14:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-12 22:14:39 +0300
commit29c0cff680efe3445870acc82591ba881ea1df1c (patch)
tree46ac339abb4bfca22d064c980436ba43761a1204 /source/blender/imbuf/intern
parent4b42a4908633989969f1f266c36c9cbca9fd9a99 (diff)
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.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r--source/blender/imbuf/intern/dds/dds_api.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index c963609b321..12e03f55450 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>