Index: source/glyphs/gcach_layout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
retrieving revision 1.22
diff -u -r1.22 gcach_layout.cxx
--- source/glyphs/gcach_layout.cxx	28 May 2003 12:31:58 -0000	1.22
+++ source/glyphs/gcach_layout.cxx	10 Jul 2003 22:22:50 -0000
@@ -79,7 +79,7 @@
 #ifdef WIN32
 #include <malloc.h>
 #define alloca _alloca
-#elif !defined(FREEBSD) && !defined(NETBSD)
+#elif !defined(FREEBSD) && !defined(NETBSD) && !defined(MACOSX)
 #include <alloca.h>
 #endif
 
Index: unx/inc/saldata.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/inc/saldata.hxx,v
retrieving revision 1.4
diff -u -r1.4 saldata.hxx
--- unx/inc/saldata.hxx	27 Mar 2003 17:58:31 -0000	1.4
+++ unx/inc/saldata.hxx	10 Jul 2003 22:22:54 -0000
@@ -94,7 +94,7 @@
 
 DECLARE_LIST( SalDisplays, SalDisplay* )
 
-#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD
+#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD || defined MACOSX
 #include <pthread.h>
 #else
 typedef	unsigned int pthread_t;
Index: unx/source/gdi/gcach_xpeer.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/gcach_xpeer.cxx,v
retrieving revision 1.30
diff -u -r1.30 gcach_xpeer.cxx
--- unx/source/gdi/gcach_xpeer.cxx	28 May 2003 12:33:58 -0000	1.30
+++ unx/source/gdi/gcach_xpeer.cxx	10 Jul 2003 22:22:54 -0000
@@ -182,17 +182,10 @@
     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);
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.45
diff -u -r1.45 makefile.mk
--- util/makefile.mk	10 Jun 2003 14:31:36 -0000	1.45
+++ util/makefile.mk	10 Jul 2003 22:22:54 -0000
@@ -266,7 +266,7 @@
 .IF "$(GUI)"=="UNX"
 
 .IF "$(OS)"=="MACOSX"
-SHL1STDLIBS += -ldl -lstdc++ -lstlport_gcc
+SHL1STDLIBS += -ldl
 .ENDIF
 
 .IF "$(GUIBASE)"=="aqua"
@@ -274,9 +274,6 @@
 .ENDIF
 
 .IF "$(GUIBASE)"=="unx"
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS += -lXext
-.ENDIF
 
 # search for freetype in systems dir at runtime
 .IF "$(OS)"=="LINUX"
Index: util/makefile.pmk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.pmk,v
retrieving revision 1.13
diff -u -r1.13 makefile.pmk
--- util/makefile.pmk	27 Aug 2002 18:09:42 -0000	1.13
+++ util/makefile.pmk	10 Jul 2003 22:22:54 -0000
@@ -64,10 +64,6 @@
 PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
 PDBTARGET=vcl
 
-.IF "$(OS)"=="MACOSX"
-GUIBASE=aqua
-.ENDIF
-
 .IF "$(remote)" != ""
 USE_BUILTIN_RASTERIZER=true
 .ENDIF