Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be4ca217 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release

parents 53a7fc36 bf0b8933

opengl/include/EGL/eglplatform.h

+11 −12
Original line number Diff line number Diff line
@@ -78,18 +78,7 @@ typedef int EGLNativeDisplayType; 
typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;



#elif defined(__unix__) && !defined(ANDROID)



/* X11 (tentative)  */

#include <X11/Xlib.h>

#include <X11/Xutil.h>



typedef Display *EGLNativeDisplayType;

typedef Pixmap   EGLNativePixmapType;

typedef Window   EGLNativeWindowType;





#elif defined(ANDROID)

#elif defined(__ANDROID__) || defined(ANDROID)



#include <android/native_window.h>
@@ -99,6 +88,16 @@ typedef struct ANativeWindow* EGLNativeWindowType; 
typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef void*                           EGLNativeDisplayType;



#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"

#endif