Commit 6c1f5306 authored by Brian Anderson's avatar Brian Anderson Committed by Commit Bot

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

Bug: 769415
Change-Id: I8e16a2a35286144eaa2d97b4d5f7cf239a00a8e5
Reviewed-on: https://chromium-review.googlesource.com/703739Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Brian Anderson <brianderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506957}
parent 4af17aad
...@@ -77,7 +77,7 @@ typedef HDC EGLNativeDisplayType; ...@@ -77,7 +77,7 @@ typedef HDC EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType; typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType; typedef HWND EGLNativeWindowType;
#elif defined(__WINSCW__) || defined(__SYMBIAN32__) #elif defined(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
typedef int EGLNativeDisplayType; typedef int EGLNativeDisplayType;
typedef void *EGLNativeWindowType; typedef void *EGLNativeWindowType;
...@@ -109,19 +109,6 @@ typedef Display *EGLNativeDisplayType; ...@@ -109,19 +109,6 @@ typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType; typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType; 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 #else
#error "Platform not recognized" #error "Platform not recognized"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment