Index: inc/solar.h =================================================================== RCS file: /cvs/util/tools/inc/solar.h,v retrieving revision 1.34.6.1 diff -u -r1.34.6.1 solar.h --- inc/solar.h 15 Feb 2004 18:19:38 -0000 1.34.6.1 +++ inc/solar.h 18 Feb 2004 18:56:26 -0000 @@ -63,6 +63,10 @@ #ifndef _SOLAR_H #define _SOLAR_H +#ifndef _SAL_TYPES_H_ +#include +#endif + /*** common solar defines ***********************************/ #ifndef TRUE @@ -81,63 +85,38 @@ #define _SOLAR__PRIVATE 1 #define __REFERENCED 0 -/*** common solar types ******************************************/ - -typedef unsigned char BOOL; -typedef unsigned char BYTE; -typedef unsigned short USHORT; -typedef unsigned long ULONG; -typedef int FASTBOOL; +/*** common solar types ********************************************/ +/* NOTE: these types are deprecated, or soon will be. They should */ +/* not be used in new code, and should be replaced with their */ +/* corresponding types from sal/types.h in old code when possible. */ + +typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */ +typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */ +typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */ +typedef sal_uInt32 ULONG; /* typedef unsigned long ULONG; */ +typedef int FASTBOOL; #ifndef _SOLAR_NOUINT +typedef sal_Int16 INT16; /* typedef short INT16; */ +typedef sal_uInt16 UINT16; /* typedef unsigned short UINT16; *; +typedef sal_Char INT8; /* typedef char INT8; */ +typedef sal_uInt8 UINT8; /* typedef unsigned char UINT8; */ + /* types with exact defined size (not just the minimum size) */ #if defined ALPHA && !defined WNT -typedef long INT64; -typedef unsigned long UINT64; -typedef int INT32; -typedef unsigned int UINT32; -typedef short INT16; -typedef unsigned short UINT16; -typedef char INT8; -typedef unsigned char UINT8; +typedef sal_Int64 INT64; /* typedef long INT64; */ +typedef sal_uInt64 UINT64; /* typedef unsigned long UINT64; */ +typedef sal_Int32 INT32; /* typedef int INT32; */ +typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32; */ #else #if !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD ) typedef void INT64; typedef void UINT64; -typedef long INT32; -typedef unsigned long UINT32; +typedef sal_Int32 INT32; /* typedef long INT32; */ +typedef sal_uInt32 UINT32; /* typedef unsigned long UINT32; */ #endif -typedef short INT16; -typedef unsigned short UINT16; -typedef signed char INT8; -typedef unsigned char UINT8; #endif #endif /* _SOLAR_NOUINT */ - - -/*** description of platform and compiler properties *******************/ - -#ifndef _SOLAR_NODESCRIPTION -#if defined UNX -#include -#else -#if defined WNT /* auf PC's */ -#define __LITTLEENDIAN -#define __ALIGNMENT2 1 -#define __ALIGNMENT4 1 -#define __ALIGNMENT8 1 -#define __STACKALIGNMENT 4 -#define __STACKDIRECTION -1 -#define __SIZEOFCHAR 1 -#define __SIZEOFSHORT 2 -#define __SIZEOFINT 4 -#define __SIZEOFLONG 4 -#define __SIZEOFPOINTER 4 -#define __SIZEOFDOUBLE 8 -#define __IEEEDOUBLE -#endif -#endif -#endif /* _SOLAR_NODESCRIPTION */ /*** misc. macros to leverage platform and compiler differences ********/ Index: prj/build.lst =================================================================== RCS file: /cvs/util/tools/prj/build.lst,v retrieving revision 1.15 diff -u -r1.15 build.lst --- prj/build.lst 20 Oct 2003 15:48:09 -0000 1.15 +++ prj/build.lst 18 Feb 2004 18:56:26 -0000 @@ -8,24 +8,23 @@ tl tools\prj usr7 - all tl_deliver NULL tl tools\prj usr42 - all tl_zn NULL tl tools\workben get - all tl_wben NULL -tl tools\source\solar nmake - u tl_sol NULL -tl tools\source\generic nmake - all tl_gen tl_fsys tl_sol.u NULL -tl tools\source\memtools nmake - all tl_mem tl_fsys tl_sol.u NULL -tl tools\source\memmgr nmake - all tl_mgr tl_fsys tl_sol.u NULL -tl tools\source\debug nmake - all tl_deb tl_fsys tl_sol.u NULL -tl tools\source\intntl nmake - all tl_int tl_fsys tl_sol.u NULL -tl tools\source\datetime nmake - all tl_dat tl_fsys tl_sol.u NULL -tl tools\source\stream nmake - all tl_str tl_fsys tl_sol.u NULL -tl tools\source\rc nmake - all tl_rc tl_fsys tl_sol.u NULL -tl tools\source\ref nmake - all tl_ref tl_fsys tl_sol.u NULL -tl tools\source\fsys nmake - all tl_fsys tl_sol.u NULL -tl tools\source\zcodec nmake - all tl_zco tl_fsys tl_sol.u NULL -tl tools\source\communi nmake - all tl_com tl_fsys tl_sol.u NULL -tl tools\source\inet nmake - all tl_inet tl_fsys tl_sol.u NULL -tl tools\source\timestamp nmake - all tl_tstamp tl_fsys tl_sol.u NULL -tl tools\source\string nmake - all tl_string tl_fsys tl_sol.u NULL +tl tools\source\generic nmake - all tl_gen tl_fsys NULL +tl tools\source\memtools nmake - all tl_mem tl_fsys NULL +tl tools\source\memmgr nmake - all tl_mgr tl_fsys NULL +tl tools\source\debug nmake - all tl_deb tl_fsys NULL +tl tools\source\intntl nmake - all tl_int tl_fsys NULL +tl tools\source\datetime nmake - all tl_dat tl_fsys NULL +tl tools\source\stream nmake - all tl_str tl_fsys NULL +tl tools\source\rc nmake - all tl_rc tl_fsys NULL +tl tools\source\ref nmake - all tl_ref tl_fsys NULL +tl tools\source\fsys nmake - all tl_fsys NULL +tl tools\source\zcodec nmake - all tl_zco tl_fsys NULL +tl tools\source\communi nmake - all tl_com tl_fsys NULL +tl tools\source\inet nmake - all tl_inet tl_fsys NULL +tl tools\source\timestamp nmake - all tl_tstamp tl_fsys NULL +tl tools\source\string nmake - all tl_string tl_fsys NULL tl tools\win\source\dll nmake - w tl_dllw NULL -tl tools\unx\source\dll nmake - u tl_dllu tl_sol.u NULL +tl tools\unx\source\dll nmake - u tl_dllu NULL tl tools\mac\source nmake - m tl_dllm NULL tl tools\util nmake - all tl_utl tl_com tl_dat tl_deb tl_dllm.m tl_dllu.u tl_dllw.w tl_fsys tl_gen tl_inet tl_int tl_mem tl_mgr tl_rc tl_ref tl_str tl_string tl_tstamp tl_zco NULL tl tools\symbol nmake - all tl_sym tl_utl NULL