diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/EGL/egltypes.h
--- a/epoc32/include/EGL/egltypes.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/EGL/egltypes.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -11,42 +11,79 @@
 // Contributors:
 //
 // Description:
-// GLES/EGLTYPES.H
+// EGL/EGLTYPES.H
 // 
 //
 
-#ifndef __GLES_EGLTYPES_H_
-#define __GLES_EGLTYPES_H_
+#ifndef __EGL_EGLTYPES_H__
+#define __EGL_EGLTYPES_H__
+
+#include <e32def.h>
+
+
+#ifndef EGLAPIENTRY
+#define EGLAPIENTRY
+#endif
+
+#ifndef EGLAPIENTRYP
+#define EGLAPIENTRYP EGLAPIENTRY*
+#endif
+
+#ifndef EGL_APIENTRY
+#define EGL_APIENTRY EGLAPIENTRY
+#endif
+
+#ifndef EGLAPI
+#define EGLAPI IMPORT_C
+#endif
 
 
 /**
-@publishedPartner
+@publishedAll
+@released
+*/
 
-__OPENGLESHEADERS_LEGACY_EGL_1_1
-    
-The purpose of this define is to allow the staged migration to
-EGL 1.3 from EGL 1.1 taken from the perspective of OpenGL ES 1.X
+/*
+** egltypes.h is platform dependent. It defines:
+**
+**     - EGL types and resources
+**     - Native types
+**     - EGL and native handle values
+**
+** EGL types and resources are to be typedef'ed with appropriate platform
+** dependent resource handle types. EGLint must be an integer of at least
+** 32-bit.
+**
+** NativeDisplayType, NativeWindowType and NativePixmapType are to be
+** replaced with corresponding types of the native window system in egl.h.
+**
+** EGL and native handle values must match their types.
+**
+*/
 
-If __OPENGLESHEADERS_LEGACY_EGL_1_1 is defined, then GLES/egl.h and
-GLES/egltypes.h will only provide the EGL 1.1 API; in particular no
-symbols from a later version of EGL will be seen at a source code level.
-This is considered to be legacy behaviour.  If
-__OPENGLESHEADERS_LEGACY_EGL_1_1 is not defined, the GLES/egl.h
-and GLES/egltypes.h header files will re-direct to the system-wide
-EGL/egl.h. and EGL/egltypes.h respectively.
 
-The use of GLES/egl.h or GLES/egltypes.h by applications is considered
-legacy behaviour because applications should instead use EGL/egl.h
-or EGL/egltypes.h respectively.
+typedef int EGLBoolean;
+typedef int EGLint;
+typedef int EGLenum;
 
-When this legacy behaviour is desired, the define should be placed in an
-OEM-specific system-wide .hrh file.  Symbian product configurations
-never set this legacy behaviour.
-*/
-#ifdef __OPENGLESHEADERS_LEGACY_EGL_1_1
-#include <GLES/legacy_egl_1_1/egltypes.h>
-#else
-#include <EGL/egltypes.h>
-#endif
+typedef int EGLDisplay;
+typedef int EGLConfig;
+typedef int EGLSurface;
+typedef int EGLContext;
+typedef int EGLClientBuffer;
 
-#endif /* __GLES_EGLTYPES_H_ */
+typedef int    NativeDisplayType;
+typedef void*  NativeWindowType;
+typedef void*  NativePixmapType;
+
+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
+typedef NativeDisplayType EGLNativeDisplayType;
+typedef NativePixmapType EGLNativePixmapType;
+typedef NativeWindowType EGLNativeWindowType;
+
+#define EGL_DEFAULT_DISPLAY 0
+#define EGL_NO_CONTEXT 0
+#define EGL_NO_DISPLAY 0
+#define EGL_NO_SURFACE 0
+
+#endif // __EGL_EGLTYPES_H__