diff -r faed0e24b58a -r ac1910f6e7cb egl/eglinterface/include/khrplatform.h
--- a/egl/eglinterface/include/khrplatform.h	Fri Jun 11 16:28:08 2010 +0100
+++ b/egl/eglinterface/include/khrplatform.h	Tue Jun 15 15:39:06 2010 +0100
@@ -85,6 +85,7 @@
 #endif
 
 #include <e32def.h>
+#include <khronos_types.h>
 
 /*-------------------------------------------------------------------------
  * Definition of KHRONOS_APICALL and KHRONOS_APIENTRY
@@ -139,18 +140,12 @@
 #define KHRONOS_SUPPORT_INT64   0
 #define KHRONOS_SUPPORT_FLOAT   0
 
-typedef TReal32 khronos_float;    // float
-typedef TReal32 khronos_float_t;    // float
-typedef TInt8   khronos_int8_t;   // signed char
-typedef TUint8  khronos_uint8_t;  // unsigned char
-typedef TInt16  khronos_int16_t;  // short int
-typedef TUint16 khronos_uint16_t; // unsigned short int
-typedef TInt32  khronos_int32_t;  // long int
-typedef TUint32 khronos_uint32_t; // unsigned long int
+// The other types are defined in <khronos_types.h>
+// These have been removed, as GCC does not allow re-definition of the same type (even with the same name)
+
 typedef TInt64  khronos_int64_t;  // long int
 typedef TUint64 khronos_uint64_t; // unsigned long int
 
-typedef TUint64	khronos_utime_nanoseconds_t;
 typedef TInt32	khronos_stime_nanoseconds_t;
 
 #ifdef __cplusplus