commit d64ab831b718591c2d4f2bcea4892da7e2d4e5fc
author Brian Anderson <brianderson@chromium.org> Mon Oct 09 23:17:37 2017
committer Commit Bot <commit-bot@chromium.org> Mon Oct 09 23:17:37 2017
tree 8f52bcf6b7b90220a92a67f0fa065f479f08d697
parent 723dc6ad11391453a2237f0fcbec35f3779086b6

egl: Use khronos version of __APPLE__ section in eglplatform.h

Bug: 769415
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I5586b1ff0405fddbf950fe3d2ca877594ea39d95
Reviewed-on: https://chromium-review.googlesource.com/705877
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Brian Anderson <brianderson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#507526}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3fe13ca8f244535aee53771e6e8545810e9ac5e3

EGL/eglplatform.h

diff --git a/EGL/eglplatform.h b/EGL/eglplatform.h
index f2d5237..c599a58 100644
--- a/EGL/eglplatform.h
+++ b/EGL/eglplatform.h
@@ -77,7 +77,8 @@
 typedef HBITMAP EGLNativePixmapType;
 typedef HWND    EGLNativeWindowType;
 
-#elif defined(__WINSCW__) || defined(__SYMBIAN32__)
+#elif defined(__APPLE__) || defined(__WINSCW__) || \
+    defined(__SYMBIAN32__) /* Symbian */
 
 typedef int   EGLNativeDisplayType;
 typedef void *EGLNativeWindowType;
@@ -109,19 +110,6 @@
 typedef Pixmap   EGLNativePixmapType;
 typedef Window   EGLNativeWindowType;
 
-#elif defined(__APPLE__)
-
-/* Chromium-specific __APPLE__ EGLNative* definition */
-typedef void          *EGLNativeDisplayType;
-typedef int            EGLNativePixmapType;
-#ifdef __OBJC__
-@class NSView;
-typedef NSView *EGLNativeWindowType;
-#else
-struct NSView;
-typedef struct NSView *EGLNativeWindowType;
-#endif  // __OBJC__
-
 #else
 #error "Platform not recognized"
 #endif