Commit 2f2c4462 authored by Hiroki Nakagawa's avatar Hiroki Nakagawa Committed by Commit Bot

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

This reverts commit 6c1f5306.

Reason for revert:
Speculative revert for build failures on the Mac bot
https://build.chromium.org/p/chromium/builders/Mac/builds/33456

Original change's description:
> egl: Use khronos version of __APPLE__ section in eglplatform.h
> 
> Bug: 769415
> Change-Id: I8e16a2a35286144eaa2d97b4d5f7cf239a00a8e5
> Reviewed-on: https://chromium-review.googlesource.com/703739
> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Commit-Queue: Brian Anderson <brianderson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#506957}

TBR=brianderson@chromium.org,kbr@chromium.org,cwallez@chromium.org

Change-Id: Ia96b247a9080be24a8c53dca6a7033aed43eb40f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 769415
Reviewed-on: https://chromium-review.googlesource.com/704334Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506958}
parent 6c1f5306
...@@ -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(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ #elif defined(__WINSCW__) || defined(__SYMBIAN32__)
typedef int EGLNativeDisplayType; typedef int EGLNativeDisplayType;
typedef void *EGLNativeWindowType; typedef void *EGLNativeWindowType;
...@@ -109,6 +109,19 @@ typedef Display *EGLNativeDisplayType; ...@@ -109,6 +109,19 @@ 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