diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2012-08-22 12:05:04 -0400 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2012-08-22 12:05:04 -0400 |
| commit | ff687885ea32bf7016618681724473745fb9ea40 (patch) | |
| tree | e3dd85f9001e039d811088a8f219b3efa21bc88e /src | |
| parent | fe72cdc5b294d61eddf2ed96072a64c50686a20c (diff) | |
| download | emacs-ff687885ea32bf7016618681724473745fb9ea40.tar.gz | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/frame.c | 1 | ||||
| -rw-r--r-- | src/frame.h | 14 |
3 files changed, 20 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d7595e69a65..bb1e694825a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2012-08-22 Dan Nicolaescu <dann@gnu.org> + + * 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 <jan.h.d@swipnet.se> * nsterm.m (insertText:): Don't clear modifiers if code is space. diff --git a/src/frame.c b/src/frame.c index a00f44a1e5a..4785840a95f 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4247,7 +4247,6 @@ syms_of_frame (void) DEFSYM (Qx, "x"); DEFSYM (Qw32, "w32"); DEFSYM (Qpc, "pc"); - DEFSYM (Qmac, "mac"); DEFSYM (Qns, "ns"); DEFSYM (Qvisible, "visible"); DEFSYM (Qbuffer_predicate, "buffer-predicate"); diff --git a/src/frame.h b/src/frame.h index 92fbda42c70..58b957519c9 100644 --- a/src/frame.h +++ b/src/frame.h @@ -621,11 +621,21 @@ typedef struct frame *FRAME_PTR; #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. */ |