[Emacs-diffs] /srv/bzr/emacs/trunk r109751: * frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_NS_P): Change to

[Dan Nicolaescu]

------------------------------------------------------------
revno: 109751
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-22 12:05:04 -0400
message:
  * frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_NS_P): Change to
  compile time tests instead of run time tests on systems that do
  not use them.
  (FRAME_MAC_P): Remove leftover from deleted code.
  * frame.c (syms_of_frame): Remove leftover from deleted code.
modified:
  src/ChangeLog
  src/frame.c
  src/frame.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-22 09:55:35 +0000
+++ b/src/ChangeLog     2012-08-22 16:05:04 +0000
@@ -1,3 +1,11 @@
+2012-08-22  Dan Nicolaescu  <address@hidden>
+
+       * frame.h (FRAME_W32_P, FRAME_MSDOS_P, FRAME_NS_P): Change to
+       compile time tests instead of run time tests on systems that do
+       not use them.
+       (FRAME_MAC_P): Remove leftover from deleted code.
+       * frame.c (syms_of_frame): Remove leftover from deleted code.
+
 2012-08-22  Jan Djärv  <address@hidden>
 
        * nsterm.m (insertText:): Don't clear modifiers if code is space.

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-08-18 06:06:39 +0000
+++ b/src/frame.c       2012-08-22 16:05:04 +0000
@@ -4247,7 +4247,6 @@
   DEFSYM (Qx, "x");
   DEFSYM (Qw32, "w32");
   DEFSYM (Qpc, "pc");
-  DEFSYM (Qmac, "mac");
   DEFSYM (Qns, "ns");
   DEFSYM (Qvisible, "visible");
   DEFSYM (Qbuffer_predicate, "buffer-predicate");

=== modified file 'src/frame.h'
--- a/src/frame.h       2012-08-17 21:52:15 +0000
+++ b/src/frame.h       2012-08-22 16:05:04 +0000
@@ -621,11 +621,21 @@
 #define FRAME_INITIAL_P(f) ((f)->output_method == output_initial)
 #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap)
 #define FRAME_X_P(f) ((f)->output_method == output_x_window)
+#ifndef WINDOWSNT
+#define FRAME_W32_P(f) (0)
+#else
 #define FRAME_W32_P(f) ((f)->output_method == output_w32)
+#endif
+#ifndef MSDOS
+#define FRAME_MSDOS_P(f) (0)
+#else
 #define FRAME_MSDOS_P(f) ((f)->output_method == output_msdos_raw)
-#define FRAME_MAC_P(f) ((f)->output_method == output_mac)
+#endif
+#ifndef HAVE_NS
+#define FRAME_NS_P(f) (0)
+#else
 #define FRAME_NS_P(f) ((f)->output_method == output_ns)
-
+#endif
 /* FRAME_WINDOW_P tests whether the frame is a window, and is
    defined to be the predicate for the window system being used.  */