projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac1ca7c)
Fixes for the Windows build past Advanced Blending. 83/247683/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Thu, 12 Nov 2020 11:33:17 +0000 (11:33 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 13 Nov 2020 09:34:27 +0000 (09:34 +0000)
Change-Id: I0ed16639a2e698ade74b31662f341c4498c2e834

dali/integration-api/adaptor-framework/scene-holder-impl.cpp patch | blob | history
dali/internal/graphics/common/egl-include.h patch | blob | history

diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
index 073372c..72db0ba 100644 (file)
--- a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
@@ -27,7 +27,6 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/dali-common.h>
-#include <sys/time.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/adaptor/common/adaptor-impl.h>
diff --git a/dali/internal/graphics/common/egl-include.h b/dali/internal/graphics/common/egl-include.h
index 6e744cf..96ce884 100644 (file)
--- a/dali/internal/graphics/common/egl-include.h
+++ b/dali/internal/graphics/common/egl-include.h
@@ -19,6 +19,8 @@
 #undef min
 #undef max
 
+#undef DIFFERENCE
+
 #include <EGL/eglext.h>
 
 #endif // EGL_INCLUDE_H
Domain: Graphics System / DALi;