|
|
@ -11,12 +11,6 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(_SYMBIAN)
|
|
|
|
|
|
|
|
# include <e32def.h>
|
|
|
|
|
|
|
|
# include <e32std.h>
|
|
|
|
|
|
|
|
# include <platform/symbian/symbiantypes.h> /* For our TInt64 impl */
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _VXWORKS
|
|
|
|
#ifdef _VXWORKS
|
|
|
|
#include "types/vxTypesOld.h"
|
|
|
|
#include "types/vxTypesOld.h"
|
|
|
|
#include "vxWorks.h"
|
|
|
|
#include "vxWorks.h"
|
|
|
@ -38,7 +32,7 @@
|
|
|
|
#define _HXTYPES_H_
|
|
|
|
#define _HXTYPES_H_
|
|
|
|
|
|
|
|
|
|
|
|
// this is essential to make sure that new is not #define'd before the C++ version is included.
|
|
|
|
// this is essential to make sure that new is not #define'd before the C++ version is included.
|
|
|
|
#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_SYMBIAN) && !defined(_OPENWAVE))
|
|
|
|
#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_OPENWAVE))
|
|
|
|
#include <memory>
|
|
|
|
#include <memory>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
@ -51,16 +45,6 @@
|
|
|
|
#error For VC++ 6.0 or higher you must include hxtypes.h before other windows header files.
|
|
|
|
#error For VC++ 6.0 or higher you must include hxtypes.h before other windows header files.
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(_SYMBIAN)
|
|
|
|
|
|
|
|
typedef TInt8 INT8;
|
|
|
|
|
|
|
|
typedef TUint8 UINT8;
|
|
|
|
|
|
|
|
typedef TInt16 INT16;
|
|
|
|
|
|
|
|
typedef TUint16 UINT16;
|
|
|
|
|
|
|
|
typedef TInt32 INT32;
|
|
|
|
|
|
|
|
typedef TUint32 UINT32;
|
|
|
|
|
|
|
|
typedef TUint32 UINT; /* Its unclear, but UINT is suppose to be 32 bits. */
|
|
|
|
|
|
|
|
typedef TBool BOOL;
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
# ifndef _VXWORKS
|
|
|
|
# ifndef _VXWORKS
|
|
|
|
|
|
|
|
|
|
|
|
typedef char INT8; /* signed 8 bit value */
|
|
|
|
typedef char INT8; /* signed 8 bit value */
|
|
|
@ -91,8 +75,6 @@ typedef TBool BOOL;
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* _VXWORKS */
|
|
|
|
#endif /* _VXWORKS */
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* _SYMBIAN */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(HELIX_CONFIG_AVOID_BOOL)
|
|
|
|
#if defined(HELIX_CONFIG_AVOID_BOOL)
|
|
|
|
typedef int HXBOOL;
|
|
|
|
typedef int HXBOOL;
|
|
|
@ -125,9 +107,6 @@ typedef unsigned long int UINT64;
|
|
|
|
#elif defined(_WINDOWS) || defined(_OPENWAVE_SIMULATOR)
|
|
|
|
#elif defined(_WINDOWS) || defined(_OPENWAVE_SIMULATOR)
|
|
|
|
typedef __int64 INT64;
|
|
|
|
typedef __int64 INT64;
|
|
|
|
typedef unsigned __int64 UINT64;
|
|
|
|
typedef unsigned __int64 UINT64;
|
|
|
|
#elif defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
|
|
|
|
|
|
|
|
typedef SymInt64 INT64;
|
|
|
|
|
|
|
|
typedef SymInt64 UINT64;
|
|
|
|
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
typedef long long INT64;
|
|
|
|
typedef long long INT64;
|
|
|
|
typedef unsigned long long UINT64;
|
|
|
|
typedef unsigned long long UINT64;
|
|
|
@ -146,21 +125,12 @@ typedef ULONG32 HX_MOFTAG;
|
|
|
|
* so, we provide these casting macros that have to be used
|
|
|
|
* so, we provide these casting macros that have to be used
|
|
|
|
* to cast 64-bit ints to smaller datatypes
|
|
|
|
* to cast 64-bit ints to smaller datatypes
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
#if defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
|
|
|
|
|
|
|
|
#define INT64_TO_ULONG32(a) ((ULONG32)((a).Low()))
|
|
|
|
|
|
|
|
#define INT64_TO_UINT32(a) ((UINT32)((a).Low()))
|
|
|
|
|
|
|
|
#define INT64_TO_INT32(a) ((INT32)((a).Low()))
|
|
|
|
|
|
|
|
#define INT64_TO_DOUBLE(a) ((a).GetTReal())
|
|
|
|
|
|
|
|
#define INT64_TO_FLOAT(a) ((a).GetTReal())
|
|
|
|
|
|
|
|
#define UINT32_TO_DOUBLE(a) (SymbianUINT32toDouble(a))
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
#define INT64_TO_ULONG32(a) ((ULONG32)(a))
|
|
|
|
#define INT64_TO_ULONG32(a) ((ULONG32)(a))
|
|
|
|
#define INT64_TO_UINT32(a) ((UINT32) (a))
|
|
|
|
#define INT64_TO_UINT32(a) ((UINT32) (a))
|
|
|
|
#define INT64_TO_INT32(a) ((INT32) (a))
|
|
|
|
#define INT64_TO_INT32(a) ((INT32) (a))
|
|
|
|
#define INT64_TO_DOUBLE(a) ((double) (a))
|
|
|
|
#define INT64_TO_DOUBLE(a) ((double) (a))
|
|
|
|
#define INT64_TO_FLOAT(a) ((float) (a))
|
|
|
|
#define INT64_TO_FLOAT(a) ((float) (a))
|
|
|
|
#define UINT32_TO_DOUBLE(a) ((double) (a))
|
|
|
|
#define UINT32_TO_DOUBLE(a) ((double) (a))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _MACINTOSH
|
|
|
|
#ifdef _MACINTOSH
|
|
|
@ -171,10 +141,6 @@ typedef ULONG32 HX_MOFTAG;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(_SYMBIAN)
|
|
|
|
|
|
|
|
#define PATH_MAX KMaxPath
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" { /* Assume C declarations for C++ */
|
|
|
|
extern "C" { /* Assume C declarations for C++ */
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* __cplusplus */
|
|
|
@ -650,7 +616,7 @@ typedef ULONG32 HXXIMAGE;
|
|
|
|
* in place of the standard header file basetsd.h, since this standard
|
|
|
|
* in place of the standard header file basetsd.h, since this standard
|
|
|
|
* header file conflicts with our definitions.
|
|
|
|
* header file conflicts with our definitions.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1100) && !defined(_SYMBIAN)
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1100)
|
|
|
|
#include "hxbastsd.h"
|
|
|
|
#include "hxbastsd.h"
|
|
|
|
#ifdef WIN32_PLATFORM_PSPC
|
|
|
|
#ifdef WIN32_PLATFORM_PSPC
|
|
|
|
#define _TYPES_H_
|
|
|
|
#define _TYPES_H_
|
|
|
|