From fc2ff44b4732cc4a2e6d1c293d5531a4723dc0e8 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 16 Jan 2005 16:18:12 +0000 Subject: [PATCH] (mac_draw_string_common): Fix compilation on OSX 10.1. --- src/ChangeLog | 4 ++++ src/macterm.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 159e64daf67..ba0115d079a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-01-16 Andreas Schwab + + * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1. + 2005-01-16 Jan Dj,Ad(Brv * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning diff --git a/src/macterm.c b/src/macterm.c index 11ec9166832..ae2555ae286 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1,5 +1,5 @@ /* Implementation of GUI terminal on the Mac OS. - Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -729,7 +729,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode, int nchars, mode, bytes_per_char; { SetPortWindowPort (w); -#ifdef MAC_OSX +#ifdef MAC_OS_X_VERSION_10_2 UInt32 textFlags, savedFlags; if (!NILP(Vmac_use_core_graphics)) { textFlags = kQDUseCGTextRendering; @@ -746,7 +746,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode, MoveTo (x, y); DrawText (buf, 0, nchars * bytes_per_char); -#ifdef MAC_OSX +#ifdef MAC_OS_X_VERSION_10_2 if (!NILP(Vmac_use_core_graphics)) SwapQDTextFlags(savedFlags); #endif -- 2.39.5