diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:24:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:24:36 +0000 |
| commit | 8c1f440b7cec09f7c1e9acf2152a36ce2216f4d8 (patch) | |
| tree | 063b11e3cdd26562b0f5b23a69e174cf16590bcc /psprint | |
| parent | 780f7d00689210b3c2f51c550b9cf33201bf123c (diff) | |
INTEGRATION: CWS os2port01 (1.36.22); FILE MERGED
2007/09/05 08:35:04 obr 1.36.22.3: RESYNC: (1.42-1.43); FILE MERGED
2007/07/13 09:33:03 obr 1.36.22.2: RESYNC: (1.36-1.42); FILE MERGED
2006/12/28 15:01:45 ydario 1.36.22.1: OS/2 initial import.
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/fontsubset/sft.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/psprint/source/fontsubset/sft.c b/psprint/source/fontsubset/sft.c index 7d058606b806..40463f94dcb5 100644 --- a/psprint/source/fontsubset/sft.c +++ b/psprint/source/fontsubset/sft.c @@ -4,9 +4,9 @@ * * $RCSfile: sft.c,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: hr $ $Date: 2007-07-31 16:01:46 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:24:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1648,7 +1648,7 @@ static void allocTrueTypeFont( TrueTypeFont** ttf ) /* forward declariotn for the two entry points to use*/ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t ); -#if ! defined WIN32 +#if !defined(WIN32) && !defined(OS2) int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf ) { int ret, fd = -1; @@ -1912,7 +1912,7 @@ void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/ { if (ttf->tag != TTFontClassTag) return; -#ifndef WIN32 +#if !defined(WIN32) && !defined(OS2) if( ttf->fname ) munmap((char *) ttf->ptr, ttf->fsize); #endif |