--- a/egl/eglinterface/include/1.2/khronos_types.h Fri Jul 23 14:07:19 2010 +0100
+++ b/egl/eglinterface/include/1.2/khronos_types.h Fri Jul 23 14:07:53 2010 +0100
@@ -31,6 +31,10 @@
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 (may need to remobe this and
+ // include a version #ifdef if there is a strong reason
+ // not to have the typedef here. For simplicity I added it
+ // here.
#endif // __KHRONOS_TYPES_H__
--- a/egl/eglinterface/include/khrplatform.h Fri Jul 23 14:07:19 2010 +0100
+++ b/egl/eglinterface/include/khrplatform.h Fri Jul 23 14:07:53 2010 +0100
@@ -85,6 +85,7 @@
#endif
#include <e32def.h>
+#include <khronos_types.h>
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL and KHRONOS_APIENTRY
@@ -94,30 +95,10 @@
#define __KHR_EXPORTS
#endif
-#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
+#ifdef __KHR_EXPORTS
+#define KHRONOS_APICALL EXPORT_C
#else
-# 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
-# define KHRONOS_APICALL
-# else
-# define KHRONOS_APICALL extern
-# endif
-# endif
+#define KHRONOS_APICALL IMPORT_C
#endif
#define KHRONOS_APIENTRY
@@ -139,18 +120,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
--- a/graphicscomposition/openwfcompositionengine/adaptation/include/owfdisplaycontextgeneral.h Fri Jul 23 14:07:19 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/include/owfdisplaycontextgeneral.h Fri Jul 23 14:07:53 2010 +0100
@@ -25,12 +25,13 @@
#include <e32def.h>
#include <WF/wfc.h>
#include <KHR/khrplatform.h>
+#include <owfimage.h>
#ifdef __cplusplus
extern "C" {
#endif
-typedef void* OWF_DISPCTX;
+// Type OWF_DISPCTX is defined in <owfimage.h>
OWF_DISPCTX OWF_DisplayContext_Create(TInt screenNum);
void OWF_DisplayContext_Destroy(TInt screenNum, OWF_DISPCTX dc);
--- a/graphicscomposition/openwfcompositionengine/adaptation/include/owfnativestream.h Fri Jul 23 14:07:19 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/include/owfnativestream.h Fri Jul 23 14:07:53 2010 +0100
@@ -59,7 +59,8 @@
OWF_STREAM_ERROR_OUT_OF_MEMORY = -3
} OWF_STREAM_ERROR;
-typedef WFCHandle WFCNativeStreamType;
+// WFCNativeStreamType is defined in <WF/wfcplatform.h>
+
/*!---------------------------------------------------------------------------
* Converts from external WFC native stream handle type to internal OWF native stream handle type.
* The internal handle MUST be persistant. The external handle may already be persistant.
--- a/graphicscomposition/openwfsupport/inc/eglsynchelper.h Fri Jul 23 14:07:19 2010 +0100
+++ b/graphicscomposition/openwfsupport/inc/eglsynchelper.h Fri Jul 23 14:07:53 2010 +0100
@@ -29,13 +29,8 @@
#ifndef EGL_EGLEXT_PROTOTYPES
-/*
- * EGLSyncKHR is an opaque handle to an EGL sync object
- */
-typedef void* EGLSyncKHR;
-
-
-typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+// The types EGLSyncKHR (an opaque handle to an EGL sync object) &
+// EGLTimeKHR are defined in <EGL/eglext.h>
/* API functions */
--- a/graphicscomposition/openwfsupport/inc/streammap.h Fri Jul 23 14:07:19 2010 +0100
+++ b/graphicscomposition/openwfsupport/inc/streammap.h Fri Jul 23 14:07:53 2010 +0100
@@ -175,7 +175,7 @@
*/
static TUint32 HashFunction(const TSurfaceId& aHashKey);
- static TInt COpenWfcStreamMap::DeleteSingleton(TAny* aData);
+ static TInt DeleteSingleton(TAny* aData);
private:
/**
* Mutex used for controlling the access to the native streams map
--- a/graphicsdeviceinterface/directgdi/inc/directgdicontext.h Fri Jul 23 14:07:19 2010 +0100
+++ b/graphicsdeviceinterface/directgdi/inc/directgdicontext.h Fri Jul 23 14:07:53 2010 +0100
@@ -155,7 +155,7 @@
IMPORT_C TInt GetInterface(TUid aInterfaceId, TAny*& aInterface);
private:
- CDirectGdiContext(CDirectGdiDriver& aDirectGdiDriver);
+ IMPORT_C CDirectGdiContext(CDirectGdiDriver& aDirectGdiDriver);
void ConstructL();
void CleanUpBrushPattern();
void DrawText(const TDesC& aText, const DirectGdi::TTextParameters* aParam, const TPoint& aPosition, DirectGdi::TTextAlign aAlignment,
--- a/windowing/windowserver/inc/W32STDGRAPHIC.H Fri Jul 23 14:07:19 2010 +0100
+++ b/windowing/windowserver/inc/W32STDGRAPHIC.H Fri Jul 23 14:07:53 2010 +0100
@@ -80,8 +80,8 @@
IMPORT_C TInt UnShare(TSecureId aClientId);
private:
CWsGraphicBitmap();
- void HandleMessage(const TDesC8& aData);
- void OnReplace();
+ IMPORT_C void HandleMessage(const TDesC8& aData);
+ IMPORT_C void OnReplace();
};
NONSHARABLE_CLASS(CWsGraphicBitmapAnimation): public CWsGraphic
--- a/windowing/windowserver/nga/SERVER/wstypes.h Fri Jul 23 14:07:19 2010 +0100
+++ b/windowing/windowserver/nga/SERVER/wstypes.h Fri Jul 23 14:07:53 2010 +0100
@@ -84,7 +84,7 @@
{
public:
inline RWsRegionBuf() {}
- inline ~RWsRegionBuf() { WS_ASSERT_DEBUG(TRegion::iCount == 0, EWsPanicInvalidRegion); }
+ inline ~RWsRegionBuf() { WS_ASSERT_DEBUG(RRegionBuf<S>::iCount == 0, EWsPanicInvalidRegion); }
inline void Close() { ASSERT(0); } //Do not use, use Reset instead.
inline void Clear() { ASSERT(0); } //Do not use, use Reset instead.
inline void Reset()
@@ -95,11 +95,11 @@
//Clear will set iCount to 0 and, if iAllocedRects>0, free heap memory and set iAllocedRects to 0.
RRegionBuf<S>::Clear();
- if(TRegion::iAllocedRects >= 0)
+ if(RRegionBuf<S>::iAllocedRects >= 0)
{
//The magic in the next statement reverts this instance back into an RRegionBuf.
//(The code is the same as can be found in the initialiser list of RRegionBuf's default constructor.)
- TRegion::iAllocedRects = -S&(~TRegion::ERRegionBuf);
+ RRegionBuf<S>::iAllocedRects = -S&(~TRegion::ERRegionBuf);
}
}
};