View | Details | Raw Unified | Return to issue 25651
Collapse All | Expand All

(-)inc/solar.h (-46 / +25 lines)
Lines 63-68 Link Here
63
#ifndef _SOLAR_H
63
#ifndef _SOLAR_H
64
#define _SOLAR_H
64
#define _SOLAR_H
65
65
66
#ifndef _SAL_TYPES_H_
67
#include <sal/types.h>
68
#endif
69
66
/*** common solar defines ***********************************/
70
/*** common solar defines ***********************************/
67
71
68
#ifndef TRUE
72
#ifndef TRUE
Lines 81-143 Link Here
81
#define _SOLAR__PRIVATE 1
85
#define _SOLAR__PRIVATE 1
82
#define __REFERENCED	0
86
#define __REFERENCED	0
83
87
84
/*** common solar types ******************************************/
88
/*** common solar types ********************************************/
85
89
/* NOTE: these types are deprecated, or soon will be.  They should */
86
typedef unsigned char		BOOL;
90
/* not be used in new code, and should be replaced with their      */
87
typedef unsigned char		BYTE;
91
/* corresponding types from sal/types.h in old code when possible. */
88
typedef unsigned short		USHORT;
92
89
typedef unsigned long		ULONG;
93
typedef sal_Bool		BOOL;	/* typedef unsigned char   BOOL; */
90
typedef int 				FASTBOOL;
94
typedef sal_uInt8		BYTE;	/* typedef unsigned char   BYTE; */
95
typedef sal_uInt16		USHORT;	/* typedef unsigned short  USHORT; */
96
typedef sal_uInt32		ULONG;	/* typedef unsigned long   ULONG; */
97
typedef int 			FASTBOOL;
91
98
92
#ifndef _SOLAR_NOUINT
99
#ifndef _SOLAR_NOUINT
100
typedef sal_Int16		INT16;	/* typedef short           INT16; */
101
typedef sal_uInt16		UINT16;	/* typedef unsigned short  UINT16; *;
102
typedef sal_Char		INT8;	/* typedef char            INT8; */
103
typedef sal_uInt8		UINT8;	/* typedef unsigned char   UINT8; */
104
93
/* types with exact defined size (not just the minimum size) */
105
/* types with exact defined size (not just the minimum size) */
94
#if defined ALPHA && !defined WNT
106
#if defined ALPHA && !defined WNT
95
typedef long				INT64;
107
typedef sal_Int64			INT64;	/* typedef long           INT64; */
96
typedef unsigned long		UINT64;
108
typedef sal_uInt64			UINT64;	/* typedef unsigned long  UINT64; */
97
typedef int 				INT32;
109
typedef sal_Int32			INT32;	/* typedef int            INT32; */
98
typedef unsigned int		UINT32;
110
typedef sal_uInt32			UINT32;	/* typedef unsigned int   UINT32; */
99
typedef short				INT16;
100
typedef unsigned short		UINT16;
101
typedef char				INT8;
102
typedef unsigned char		UINT8;
103
#else
111
#else
104
#if !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD )
112
#if !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD )
105
typedef void				INT64;
113
typedef void				INT64;
106
typedef void				UINT64;
114
typedef void				UINT64;
107
typedef long				INT32;
115
typedef sal_Int32			INT32;	/* typedef long           INT32; */
108
typedef unsigned long		UINT32;
116
typedef sal_uInt32			UINT32;	/* typedef unsigned long  UINT32; */
109
#endif
117
#endif
110
typedef short				INT16;
111
typedef unsigned short		UINT16;
112
typedef signed char 		INT8;
113
typedef unsigned char		UINT8;
114
#endif
118
#endif
115
#endif /* _SOLAR_NOUINT */
119
#endif /* _SOLAR_NOUINT */
116
117
118
/*** description of platform and compiler properties *******************/
119
120
#ifndef _SOLAR_NODESCRIPTION
121
#if defined UNX
122
#include <svconf.h>
123
#else
124
#if defined WNT /* auf PC's */
125
#define __LITTLEENDIAN
126
#define __ALIGNMENT2		1
127
#define __ALIGNMENT4		1
128
#define __ALIGNMENT8		1
129
#define __STACKALIGNMENT	4
130
#define __STACKDIRECTION   -1
131
#define __SIZEOFCHAR		1
132
#define __SIZEOFSHORT		2
133
#define __SIZEOFINT 		4
134
#define __SIZEOFLONG		4
135
#define __SIZEOFPOINTER 	4
136
#define __SIZEOFDOUBLE		8
137
#define __IEEEDOUBLE
138
#endif
139
#endif
140
#endif /* _SOLAR_NODESCRIPTION */
141
120
142
121
143
/*** misc. macros to leverage platform and compiler differences ********/
122
/*** misc. macros to leverage platform and compiler differences ********/
(-)prj/build.lst (-17 / +16 lines)
Lines 8-31 Link Here
8
tl	tools\prj							usr7	-	all	tl_deliver NULL
8
tl	tools\prj							usr7	-	all	tl_deliver NULL
9
tl	tools\prj							usr42	-	all	tl_zn NULL
9
tl	tools\prj							usr42	-	all	tl_zn NULL
10
tl	tools\workben						get		-	all	tl_wben NULL
10
tl	tools\workben						get		-	all	tl_wben NULL
11
tl	tools\source\solar					nmake	-	u	tl_sol NULL
11
tl	tools\source\generic				nmake	-	all	tl_gen tl_fsys NULL
12
tl	tools\source\generic				nmake	-	all	tl_gen tl_fsys tl_sol.u NULL
12
tl	tools\source\memtools				nmake	-	all	tl_mem tl_fsys NULL
13
tl	tools\source\memtools				nmake	-	all	tl_mem tl_fsys tl_sol.u NULL
13
tl	tools\source\memmgr					nmake	-	all	tl_mgr tl_fsys NULL
14
tl	tools\source\memmgr					nmake	-	all	tl_mgr tl_fsys tl_sol.u NULL
14
tl	tools\source\debug					nmake	-	all	tl_deb tl_fsys NULL
15
tl	tools\source\debug					nmake	-	all	tl_deb tl_fsys tl_sol.u NULL
15
tl	tools\source\intntl					nmake	-	all	tl_int tl_fsys NULL
16
tl	tools\source\intntl					nmake	-	all	tl_int tl_fsys tl_sol.u NULL
16
tl	tools\source\datetime				nmake	-	all	tl_dat tl_fsys NULL
17
tl	tools\source\datetime				nmake	-	all	tl_dat tl_fsys tl_sol.u NULL
17
tl	tools\source\stream					nmake	-	all	tl_str tl_fsys NULL
18
tl	tools\source\stream					nmake	-	all	tl_str tl_fsys tl_sol.u NULL
18
tl	tools\source\rc						nmake	-	all	tl_rc tl_fsys NULL
19
tl	tools\source\rc						nmake	-	all	tl_rc tl_fsys tl_sol.u NULL
19
tl	tools\source\ref					nmake	-	all	tl_ref tl_fsys NULL
20
tl	tools\source\ref					nmake	-	all	tl_ref tl_fsys tl_sol.u NULL
20
tl	tools\source\fsys					nmake	-	all	tl_fsys NULL
21
tl	tools\source\fsys					nmake	-	all	tl_fsys tl_sol.u NULL
21
tl	tools\source\zcodec					nmake	-	all	tl_zco tl_fsys NULL
22
tl	tools\source\zcodec					nmake	-	all	tl_zco tl_fsys tl_sol.u NULL
22
tl	tools\source\communi				nmake	-	all	tl_com tl_fsys NULL
23
tl	tools\source\communi				nmake	-	all	tl_com tl_fsys tl_sol.u NULL
23
tl	tools\source\inet					nmake	-	all	tl_inet tl_fsys NULL
24
tl	tools\source\inet					nmake	-	all	tl_inet tl_fsys tl_sol.u NULL
24
tl	tools\source\timestamp				nmake	-	all	tl_tstamp tl_fsys NULL
25
tl	tools\source\timestamp				nmake	-	all	tl_tstamp tl_fsys tl_sol.u NULL
25
tl	tools\source\string					nmake	-	all	tl_string tl_fsys NULL
26
tl	tools\source\string					nmake	-	all	tl_string tl_fsys tl_sol.u NULL
27
tl	tools\win\source\dll				nmake	-	w	tl_dllw NULL
26
tl	tools\win\source\dll				nmake	-	w	tl_dllw NULL
28
tl	tools\unx\source\dll				nmake	-	u	tl_dllu tl_sol.u NULL
27
tl	tools\unx\source\dll				nmake	-	u	tl_dllu NULL
29
tl	tools\mac\source					nmake	-	m	tl_dllm NULL
28
tl	tools\mac\source					nmake	-	m	tl_dllm NULL
30
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
29
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
31
tl	tools\symbol						nmake	-	all	tl_sym tl_utl NULL
30
tl	tools\symbol						nmake	-	all	tl_sym tl_utl NULL

Return to issue 25651