Merge "[AT-SPI] Add API for blocking automatic Bridge initialization" into devel...

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / windows / callback-manager-win.cpp

diff --git a/dali/internal/system/windows/callback-manager-win.cpp b/dali/internal/system/windows/callback-manager-win.cpp
index 84a1279..19bf14d 100644 (file)
--- a/dali/internal/system/windows/callback-manager-win.cpp
+++ b/dali/internal/system/windows/callback-manager-win.cpp
@@ -20,6 +20,11 @@
 \r
 // EXTERNAL INCLUDES\r
 #include <Windows.h>\r
+\r
+// Need to undef the following constants as they are defined in one of the headers in Windows.h but used in DALi (via debug.h)\r
+#undef TRANSPARENT // Used in constants.h\r
+#undef CopyMemory // Used in dali-vector.h\r
+\r
 #include <dali/integration-api/debug.h>\r
 \r
 // INTERNAL INCLUDES\r