From: Nicolas Capens <capn@google.com>
Date: Thu, 31 May 2018 17:16:58 +0000 (-0400)
Subject: Don't use X11 on Mac OS.
X-Git-Tag: android-x86-7.1-r3~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f459b04359034121f89fdc8cfd98b550c1de7e70;p=android-x86%2Fexternal-swiftshader.git

Don't use X11 on Mac OS.

https://github.com/KhronosGroup/EGL-Registry/pull/43 made eglplatform.h
include X11 headers on Mac OS, which aren't pre-installed and breaks
the Chrome build.

https://github.com/KhronosGroup/EGL-Registry/issues/52

Change-Id: I73e3c11244a07e269684323ce76cc9700fe9c1aa
Reviewed-on: https://swiftshader-review.googlesource.com/19088
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
---

diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index 4cba6a105..97c31e27a 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -77,7 +77,7 @@ typedef HDC     EGLNativeDisplayType;
 typedef HBITMAP EGLNativePixmapType;
 typedef HWND    EGLNativeWindowType;
 
-#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
+#elif defined(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
 
 typedef int   EGLNativeDisplayType;
 typedef void *EGLNativeWindowType;
@@ -110,7 +110,7 @@ typedef intptr_t EGLNativeDisplayType;
 typedef intptr_t EGLNativeWindowType;
 typedef intptr_t EGLNativePixmapType;
 
-#elif defined(__unix__) || defined(__APPLE__)
+#elif defined(__unix__)
 
 /* X11 (tentative)  */
 #include <X11/Xlib.h>