projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e8169c5)
Fixed MS Windows min, max compile error. 50/237150/1
authorVictor Cebollada <v.cebollada@samsung.com>
Mon, 22 Jun 2020 14:02:23 +0000 (15:02 +0100)
committerVíctor Cebollada <v.cebollada@samsung.com>
Thu, 25 Jun 2020 09:31:03 +0000 (09:31 +0000)
Change-Id: I96d60fce295aae527313c24dd480b069466b21b3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
(cherry picked from commit 38f0ac6c8425a794371921cbb44e5763151335b8)

dali/internal/graphics/common/egl-include.h patch | blob | history

diff --git a/dali/internal/graphics/common/egl-include.h b/dali/internal/graphics/common/egl-include.h
index d0d1cad..6e744cf 100644 (file)
--- a/dali/internal/graphics/common/egl-include.h
+++ b/dali/internal/graphics/common/egl-include.h
@@ -16,6 +16,9 @@
 #undef CopyMemory
 #undef CreateWindow
 
+#undef min
+#undef max
+
 #include <EGL/eglext.h>
 
 #endif // EGL_INCLUDE_H
Domain: Graphics System / DALi;