Attachment #7553 for issue #16692

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

Lines 79-85 Link Here

(-)source/glyphs/gcach_layout.cxx (-1 / +1 lines)
79	#ifdef WIN32	79	#ifdef WIN32
80	#include <malloc.h>	80	#include <malloc.h>
81	#define alloca _alloca	81	#define alloca _alloca
82	#elif !defined(FREEBSD) && !defined(NETBSD)	82	#elif !defined(FREEBSD) && !defined(NETBSD) && !defined(MACOSX)
83	#include <alloca.h>	83	#include <alloca.h>
84	#endif	84	#endif
85		85

Lines 94-100 Link Here

(-)unx/inc/saldata.hxx (-1 / +1 lines)
94		94
95	DECLARE_LIST( SalDisplays, SalDisplay* )	95	DECLARE_LIST( SalDisplays, SalDisplay* )
96		96
97	#if defined SCO \|\| defined LINUX \|\| defined NETBSD \|\| defined AIX \|\| defined HPUX \|\| defined FREEBSD	97	#if defined SCO \|\| defined LINUX \|\| defined NETBSD \|\| defined AIX \|\| defined HPUX \|\| defined FREEBSD \|\| defined MACOSX
98	#include <pthread.h>	98	#include <pthread.h>
99	#else	99	#else
100	typedef unsigned int pthread_t;	100	typedef unsigned int pthread_t;




    if( !pFunc ) return;
    pXRenderFreeGlyphs              = (void(*)(Display*,GlyphSet,Glyph*,int))pFunc;

#ifdef MACOSX
    OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString16"));
    pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData);
    if( !pFunc ) return;
    pXRenderCompositeString16       = (void(*)(Display*,int,Picture,Picture,XRenderPictFormat*,GlyphSet,int,int,int,int,unsigned short*,int))pFunc;
#else // MACOSX
    OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString32"));
    pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData);
    if( !pFunc ) return;
    pXRenderCompositeString32       = (void(*)(Display*,int,Picture,Picture,XRenderPictFormat*,GlyphSet,int,int,int,int,unsigned*,int))pFunc;
#endif // MACOSX

    OUString creatPicFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCreatePicture"));
    pFunc=osl_getSymbol(pRenderLib, creatPicFuncName.pData);




.IF "$(GUI)"=="UNX"

.IF "$(OS)"=="MACOSX"
SHL1STDLIBS += -ldl
.ENDIF

.IF "$(GUIBASE)"=="aqua"

.ENDIF

.IF "$(GUIBASE)"=="unx"
.IF "$(OS)"=="MACOSX"
SHL1STDLIBS += -lXext
.ENDIF

# search for freetype in systems dir at runtime
.IF "$(OS)"=="LINUX"

Lines 64-73 Link Here

(-)util/makefile.pmk (-4 lines)
64	PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch	64	PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
65	PDBTARGET=vcl	65	PDBTARGET=vcl
66		66
67	.IF "$(OS)"=="MACOSX"
68	GUIBASE=aqua
69	.ENDIF
70
71	.IF "$(remote)" != ""	67	.IF "$(remote)" != ""
72	USE_BUILTIN_RASTERIZER=true	68	USE_BUILTIN_RASTERIZER=true
73	.ENDIF	69	.ENDIF

Return to issue 16692

Lines 182-198 Link Here

(-)unx/source/gdi/gcach_xpeer.cxx (-7 lines)
182	if( !pFunc ) return;	182	if( !pFunc ) return;
183	pXRenderFreeGlyphs = (void()(Display,GlyphSet,Glyph*,int))pFunc;	183	pXRenderFreeGlyphs = (void()(Display,GlyphSet,Glyph*,int))pFunc;
184		184
185	#ifdef MACOSX
186	OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString16"));
187	pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData);
188	if( !pFunc ) return;
189	pXRenderCompositeString16 = (void()(Display,int,Picture,Picture,XRenderPictFormat,GlyphSet,int,int,int,int,unsigned short,int))pFunc;
190	#else // MACOSX
191	OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString32"));	185	OUString compStringFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCompositeString32"));
192	pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData);	186	pFunc=osl_getSymbol(pRenderLib, compStringFuncName.pData);
193	if( !pFunc ) return;	187	if( !pFunc ) return;
194	pXRenderCompositeString32 = (void()(Display,int,Picture,Picture,XRenderPictFormat,GlyphSet,int,int,int,int,unsigned,int))pFunc;	188	pXRenderCompositeString32 = (void()(Display,int,Picture,Picture,XRenderPictFormat,GlyphSet,int,int,int,int,unsigned,int))pFunc;
195	#endif // MACOSX
196		189
197	OUString creatPicFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCreatePicture"));	190	OUString creatPicFuncName(RTL_CONSTASCII_USTRINGPARAM("XRenderCreatePicture"));
198	pFunc=osl_getSymbol(pRenderLib, creatPicFuncName.pData);	191	pFunc=osl_getSymbol(pRenderLib, creatPicFuncName.pData);

Lines 266-272 Link Here

(-)util/makefile.mk (-4 / +1 lines)
266	.IF "$(GUI)"=="UNX"	266	.IF "$(GUI)"=="UNX"
267		267
268	.IF "$(OS)"=="MACOSX"	268	.IF "$(OS)"=="MACOSX"
269	SHL1STDLIBS += -ldl -lstdc++ -lstlport_gcc	269	SHL1STDLIBS += -ldl
270	.ENDIF	270	.ENDIF
271		271
272	.IF "$(GUIBASE)"=="aqua"	272	.IF "$(GUIBASE)"=="aqua"
Lines 274-282 Link Here
274	.ENDIF	274	.ENDIF
275		275
276	.IF "$(GUIBASE)"=="unx"	276	.IF "$(GUIBASE)"=="unx"
277	.IF "$(OS)"=="MACOSX"
278	SHL1STDLIBS += -lXext
279	.ENDIF
280		277
281	# search for freetype in systems dir at runtime	278	# search for freetype in systems dir at runtime
282	.IF "$(OS)"=="LINUX"	279	.IF "$(OS)"=="LINUX"