| Index: ppapi/lib/gl/include/EGL/eglplatform.h
|
| ===================================================================
|
| --- ppapi/lib/gl/include/EGL/eglplatform.h (revision 69281)
|
| +++ ppapi/lib/gl/include/EGL/eglplatform.h (working copy)
|
| @@ -67,41 +67,12 @@
|
| * implementations.
|
| */
|
|
|
| -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
|
| -#ifndef WIN32_LEAN_AND_MEAN
|
| -#define WIN32_LEAN_AND_MEAN 1
|
| -#endif
|
| -#include <windows.h>
|
| +#include "ppapi/c/pp_instance.h"
|
|
|
| -typedef HDC EGLNativeDisplayType;
|
| -typedef HBITMAP EGLNativePixmapType;
|
| -typedef HWND EGLNativeWindowType;
|
| +typedef PP_Instance EGLNativeDisplayType;
|
| +typedef PP_Instance EGLNativeWindowType;
|
| +typedef khronos_int32_t EGLNativePixmapType; // Not supported.
|
|
|
| -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
|
| -
|
| -typedef int EGLNativeDisplayType;
|
| -typedef void *EGLNativeWindowType;
|
| -typedef void *EGLNativePixmapType;
|
| -
|
| -#elif defined(__unix__)
|
| -
|
| -/* X11 (tentative) */
|
| -#include <X11/Xlib.h>
|
| -#include <X11/Xutil.h>
|
| -
|
| -typedef Display *EGLNativeDisplayType;
|
| -typedef Pixmap EGLNativePixmapType;
|
| -typedef Window EGLNativeWindowType;
|
| -
|
| -#else
|
| -/* #error "Platform not recognized" */
|
| -
|
| -typedef int EGLNativeDisplayType;
|
| -typedef int EGLNativePixmapType;
|
| -typedef int EGLNativeWindowType;
|
| -
|
| -#endif
|
| -
|
| /* EGL 1.2 types, renamed for consistency in EGL 1.3 */
|
| typedef EGLNativeDisplayType NativeDisplayType;
|
| typedef EGLNativePixmapType NativePixmapType;
|
|
|