# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1270724780 -3600
# Node ID 8d23fe8ae91bcfd72e22d25e04468cd26e2d8fda
# Parent  30f62d96b8987383cbf45d833b34b42aaa3ce2d2# Parent  c0155353733c0efb8d28cbd9dcc0abb0e985490e
Merge.

diff -r c0155353733c -r 8d23fe8ae91b egl/eglinterface/include/1.4/khronos_types.h
--- a/egl/eglinterface/include/1.4/khronos_types.h	Fri Apr 02 11:19:42 2010 +0100
+++ b/egl/eglinterface/include/1.4/khronos_types.h	Thu Apr 08 12:06:20 2010 +0100
@@ -31,6 +31,11 @@
 typedef TUint16 khronos_uint16_t; // unsigned short int
 typedef TInt32  khronos_int32_t;  // long int
 typedef TUint32 khronos_uint32_t; // unsigned long int
-typedef TUint64 khronos_utime_nanoseconds_t;  // unsigned long long
+
+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;
 
 #endif // __KHRONOS_TYPES_H__
diff -r c0155353733c -r 8d23fe8ae91b egl/eglinterface/include/khrplatform.h
--- a/egl/eglinterface/include/khrplatform.h	Fri Apr 02 11:19:42 2010 +0100
+++ b/egl/eglinterface/include/khrplatform.h	Thu Apr 08 12:06:20 2010 +0100
@@ -86,6 +86,8 @@
 
 #include <e32def.h>
 
+#include <khronos_types.h> // For khronos_int8_t and similar type definitions.
+
 /*-------------------------------------------------------------------------
  * Definition of KHRONOS_APICALL and KHRONOS_APIENTRY
  *-----------------------------------------------------------------------*/
@@ -128,7 +130,7 @@
 #	define KHRAPI KHRONOS_APICALL
 #endif
 
-#if defined (__ARMCC_2__)
+#if defined (__ARMCC__)
 #define KHRONOS_APIATTRIBUTES __softfp
 #else
 #define KHRONOS_APIATTRIBUTES
@@ -137,20 +139,6 @@
 #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
-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
 }
 #endif