(mac_draw_string_common): Fix compilation on OSX 10.1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 159e64daf67868a5cce34cfda20094c4cc666d80..ba0115d079aabba948c922ef4165008eabc8d8b3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-16  Andreas Schwab  <schwab@suse.de>
+
+       * macterm.c (mac_draw_string_common): Fix compilation on OSX 10.1.
+
 2005-01-16  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning

diff --git a/src/macterm.c b/src/macterm.c
index 11ec91668323930eda4e1a4ff860b9c609cb205c..ae2555ae286f451bfa0424c3fa1410b72fafa083 100644 (file)
--- 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