--- a/egl/eglinterface/include/khrplatform.h	Thu Aug 19 11:11:18 2010 +0300
+++ b/egl/eglinterface/include/khrplatform.h	Tue Aug 31 16:31:06 2010 +0300
@@ -94,27 +94,29 @@
 #define __KHR_EXPORTS
 #endif
 
-#   if defined(_WIN32) || defined(__VC32__) || defined(__MWERKS__) || defined(__CW32__)         /* Win32 */
+#if defined(_WIN32) || defined(__VC32__) || defined(__MWERKS__) || defined(__CW32__)         /* Win32 */
 #   ifdef __KHR_EXPORTS
 #       define KHRONOS_APICALL __declspec(dllexport)
 #   else
 #       define KHRONOS_APICALL __declspec(dllexport)
 #   endif
 #else
-#   if defined (__ARMCC_2_2__)
-#   	ifdef __KHR_EXPORTS
-#	    	define KHRONOS_APICALL __declspec(dllexport)
-#   	else
-#	    	define KHRONOS_APICALL __declspec(dllimport)
-#   	endif
-#   elif (__ARMCC_VERSION >= 310000)
-#	    define KHRONOS_APICALL __declspec(dllimport)
+#   if defined (__ARMCC_VERSION)
+#       if (__ARMCC_VERSION <= 310000) || (__ARMCC_VERSION >= 400000)
+#          ifdef __KHR_EXPORTS
+#            define KHRONOS_APICALL __declspec(dllexport)
+#          else
+#            define KHRONOS_APICALL __declspec(dllimport)
+#          endif
+#       else
+#         define KHRONOS_APICALL __declspec(dllimport)
+#       endif
 #   else
-#   	ifdef __KHR_EXPORTS
+#       ifdef __KHR_EXPORTS
 #           define KHRONOS_APICALL
-#   	else
+#       else
 #           define KHRONOS_APICALL extern
-#		endif
+#       endif
 #   endif
 #endif
 
@@ -128,7 +130,7 @@
 #	define KHRAPI KHRONOS_APICALL
 #endif
 
-#if defined (__ARMCC_2__)
+#if defined(__ARMCC__)
 #define KHRONOS_APIATTRIBUTES __softfp
 #else
 #define KHRONOS_APIATTRIBUTES