aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2005-01-16 16:18:12 +0000
committerAndreas Schwab2005-01-16 16:18:12 +0000
commitfc2ff44b4732cc4a2e6d1c293d5531a4723dc0e8 (patch)
tree337b4dfa1c751cd6af3bd06737de75a4bbb2e4a1 /src
parent01917a18b40405b2cb7eaf279e8db13875c9c5be (diff)
downloademacs-fc2ff44b4732cc4a2e6d1c293d5531a4723dc0e8.tar.gz
emacs-fc2ff44b4732cc4a2e6d1c293d5531a4723dc0e8.zip
(mac_draw_string_common): Fix compilation on OSX 10.1.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/macterm.c6
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 @@
12005-01-16 Andreas Schwab <schwab@suse.de>
2
3 * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1.
4
12005-01-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52005-01-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning 7 * 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 @@
1/* Implementation of GUI terminal on the Mac OS. 1/* Implementation of GUI terminal on the Mac OS.
2 Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. 2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -729,7 +729,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
729 int nchars, mode, bytes_per_char; 729 int nchars, mode, bytes_per_char;
730{ 730{
731 SetPortWindowPort (w); 731 SetPortWindowPort (w);
732#ifdef MAC_OSX 732#ifdef MAC_OS_X_VERSION_10_2
733 UInt32 textFlags, savedFlags; 733 UInt32 textFlags, savedFlags;
734 if (!NILP(Vmac_use_core_graphics)) { 734 if (!NILP(Vmac_use_core_graphics)) {
735 textFlags = kQDUseCGTextRendering; 735 textFlags = kQDUseCGTextRendering;
@@ -746,7 +746,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode,
746 746
747 MoveTo (x, y); 747 MoveTo (x, y);
748 DrawText (buf, 0, nchars * bytes_per_char); 748 DrawText (buf, 0, nchars * bytes_per_char);
749#ifdef MAC_OSX 749#ifdef MAC_OS_X_VERSION_10_2
750 if (!NILP(Vmac_use_core_graphics)) 750 if (!NILP(Vmac_use_core_graphics))
751 SwapQDTextFlags(savedFlags); 751 SwapQDTextFlags(savedFlags);
752#endif 752#endif