diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:46:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:46:41 +0000 |
| commit | bfc2f1f4eb739e38ee470cbb586541325e0d2540 (patch) | |
| tree | 5c97fe4fab265ef465b9e268fed14b50f5925eb0 /vcl | |
| parent | 3a19ca74b662b355d242a1dcdc5f69a55700443e (diff) | |
INTEGRATION: CWS ooo11rc2 (1.4.100); FILE MERGED
2003/07/14 15:10:29 fa 1.4.100.1: Mac OS X compatibility. Force OS X to use XRenderCompositeString32 since
PORTS moved to that as well, the patch that enabled this on srx644+ is
no longer applicable to PORTS either. Misc link time additions for
OS X, bring in appropriate headers, etc.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16692
Dan
fa@ooo
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/inc/saldata.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 31b85770fb5c..46f7b2165b22 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: saldata.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-27 17:58:31 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:46:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ typedef SIG_FUNC_TYP *SIG_TYP; 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; |