Attachment #13269 for issue #25651

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





#include <sal/config.h>

/* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
#ifndef _SOLAR_NODESCRIPTION

#if defined UNX
#include <sal/typesizes.h>
#else	/* UNX */

#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	/* WNT */

#endif	/* UNX */

#endif	/* _SOLAR_NODESCRIPTION */

#ifdef __cplusplus
extern "C" {
#endif


/* #i8593#: On 64bit systems, use int for sal_*32 types. */
#if __SIZEOFLONG == 4
	typedef signed long       sal_Int32;
	typedef unsigned long     sal_uInt32;
#else
	typedef signed int        sal_Int32;
	typedef unsigned int      sal_uInt32;
#endif

#   if (_MSC_VER >= 1000)




sa	sal	:	xml2cmp NULL 
sa	sal										usr1	-	all	sa_mkout NULL
sa	sal\typesconfig						nmake	-	u	sa_tc NULL
sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util NULL
sa	sal\systools\macxp_extras\x11osx			nmake	-	u	sa_mxpext_x11osx NULL
sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u NULL
sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u NULL
sa	sal\systools\win32\uwinapi				nmake	-	n	sa_uwinapi NULL
sa	sal\systools\win32\guistdio				nmake	-	n	sa_guistdio sa_uwinapi.n NULL
sa	sal\osl\w32								nmake	-	n	sa_osln NULL
sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u NULL
sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u NULL
sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_guistdio.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL

Lines 7-12 Link Here

(-)prj/d.lst (+1 lines)
7		7
8	..\inc\udkversion.mk %_DEST%\inc%_EXT%\udkversion.mk	8	..\inc\udkversion.mk %_DEST%\inc%_EXT%\udkversion.mk
9	..\inc\sal\.h %_DEST%\inc%_EXT%\sal\.h	9	..\inc\sal\.h %_DEST%\inc%_EXT%\sal\.h
		10	..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc%_EXT%\sal\typesizes.h
10	..\inc\osl\.h %_DEST%\inc%_EXT%\osl\.h	11	..\inc\osl\.h %_DEST%\inc%_EXT%\osl\.h
11	..\inc\osl\.hxx %_DEST%\inc%_EXT%\osl\.hxx	12	..\inc\osl\.hxx %_DEST%\inc%_EXT%\osl\.hxx
12	..\inc\rtl\.h %_DEST%\inc%_EXT%\rtl\.h	13	..\inc\rtl\.h %_DEST%\inc%_EXT%\rtl\.h

Return to issue 25651

Lines 64-69 Link Here

(-)inc/sal/types.h (-4 / +31 lines)
64		64
65	#include <sal/config.h>	65	#include <sal/config.h>
66		66
		67	/* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
		68	#ifndef _SOLAR_NODESCRIPTION
		69
		70	#if defined UNX
		71	#include <sal/typesizes.h>
		72	#else /* UNX */
		73
		74	#if defined WNT /* auf PC's */
		75	#define __LITTLEENDIAN
		76	#define __ALIGNMENT2 1
		77	#define __ALIGNMENT4 1
		78	#define __ALIGNMENT8 1
		79	#define __STACKALIGNMENT 4
		80	#define __STACKDIRECTION -1
		81	#define __SIZEOFCHAR 1
		82	#define __SIZEOFSHORT 2
		83	#define __SIZEOFINT 4
		84	#define __SIZEOFLONG 4
		85	#define __SIZEOFPOINTER 4
		86	#define __SIZEOFDOUBLE 8
		87	#define __IEEEDOUBLE
		88	#endif /* WNT */
		89
		90	#endif /* UNX */
		91
		92	#endif /* _SOLAR_NODESCRIPTION */
		93
67	#ifdef __cplusplus	94	#ifdef __cplusplus
68	extern "C" {	95	extern "C" {
69	#endif	96	#endif
Lines 84-94 Link Here
84		111
85	/* #i8593#: On 64bit systems, use int for sal_32 types. /	112	/* #i8593#: On 64bit systems, use int for sal_32 types. /
86	#if __SIZEOFLONG == 4	113	#if __SIZEOFLONG == 4
87	typedef signed long sal_Int32;	114	typedef signed long sal_Int32;
88	typedef unsigned long sal_uInt32;	115	typedef unsigned long sal_uInt32;
89	#else	116	#else
90	typedef signed int sal_Int32;	117	typedef signed int sal_Int32;
91	typedef unsigned int sal_uInt32;	118	typedef unsigned int sal_uInt32;
92	#endif	119	#endif
93		120
94	# if (_MSC_VER >= 1000)	121	# if (_MSC_VER >= 1000)

Lines 1-12 Link Here

(-)prj/build.lst (-5 / +6 lines)
1	sa sal : xml2cmp NULL	1	sa sal : xml2cmp NULL
2	sa sal usr1 - all sa_mkout NULL	2	sa sal usr1 - all sa_mkout NULL
		3	sa sal\typesconfig nmake - u sa_tc NULL
3	sa sal\cpprt nmake - u sa_cpprt sa_util NULL	4	sa sal\cpprt nmake - u sa_cpprt sa_util NULL
4	sa sal\systools\macxp_extras\x11osx nmake - u sa_mxpext_x11osx NULL	5	sa sal\systools\macxp_extras\x11osx nmake - u sa_mxpext_x11osx NULL
5	sa sal\rtl\source nmake - all sa_rtl NULL	6	sa sal\rtl\source nmake - all sa_rtl sa_tc.u NULL
6	sa sal\textenc nmake - all sa_textenc NULL	7	sa sal\textenc nmake - all sa_textenc sa_tc.u NULL
7	sa sal\systools\win32\uwinapi nmake - n sa_uwinapi NULL	8	sa sal\systools\win32\uwinapi nmake - n sa_uwinapi NULL
8	sa sal\systools\win32\guistdio nmake - n sa_guistdio sa_uwinapi.n NULL	9	sa sal\systools\win32\guistdio nmake - n sa_guistdio sa_uwinapi.n NULL
9	sa sal\osl\w32 nmake - n sa_osln NULL	10	sa sal\osl\w32 nmake - n sa_osln NULL
10	sa sal\osl\unx nmake - u sa_oslu NULL	11	sa sal\osl\unx nmake - u sa_oslu sa_tc.u NULL
11	sa sal\osl\all nmake - all sa_oslall NULL	12	sa sal\osl\all nmake - all sa_oslall sa_tc.u NULL
12	sa sal\util nmake - all sa_util sa_oslall sa_uwinapi.n sa_guistdio.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL	13	sa sal\util nmake - all sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_guistdio.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL