Merged from miles@gnu.org--gnu-2005 (patch 76-78)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288

1 files changed, 3 insertions, 3 deletions

diff --git a/src/macterm.c b/src/macterm.c
index 16878f9a45a..21effb23cfa 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -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_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
   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_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
   if (!NILP(Vmac_use_core_graphics))
     SwapQDTextFlags(savedFlags);
 #endif
@@ -5451,7 +5451,7 @@ x_make_frame_visible (f)
           else
             RepositionWindow (FRAME_MAC_WINDOW (f),
                               FRAME_MAC_WINDOW (sf),
-#ifdef MAC_OS_X_VERSION_10_2
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
                               kWindowCascadeStartAtParentWindowScreen
 #else
                               kWindowCascadeOnParentWindowScreen