diff options
| author | Dmitry Antipov | 2013-09-18 13:33:36 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-18 13:33:36 +0400 |
| commit | 582ed56ca8ca6e4a6f4358deee3be8e227960031 (patch) | |
| tree | 7185bf6a646c3ab218d3fe370fb512d25f0fcb7e /src/dispextern.h | |
| parent | 18da0d8ad4e5036185acbad3238cbfe2aaf3ca66 (diff) | |
| download | emacs-582ed56ca8ca6e4a6f4358deee3be8e227960031.tar.gz emacs-582ed56ca8ca6e4a6f4358deee3be8e227960031.zip | |
Ifdef away recent changes which aren't relevant to NS port.
* dispextern.h (x_mouse_grabbed, x_redo_mouse_highlight)
[!HAVE_NS]: Declare as such.
* frame.c (x_mouse_grabbed, x_redo_mouse_highlight)
[!HAVE_NS]: Define as such.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 7244c84893d..e1d48b0e460 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3530,7 +3530,6 @@ enum resource_types | |||
| 3530 | RES_TYPE_BOOLEAN_NUMBER | 3530 | RES_TYPE_BOOLEAN_NUMBER |
| 3531 | }; | 3531 | }; |
| 3532 | 3532 | ||
| 3533 | extern bool x_mouse_grabbed (Display_Info *); | ||
| 3534 | extern Display_Info *check_x_display_info (Lisp_Object); | 3533 | extern Display_Info *check_x_display_info (Lisp_Object); |
| 3535 | extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object, | 3534 | extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object, |
| 3536 | Lisp_Object, const char *, const char *class, | 3535 | Lisp_Object, const char *, const char *class, |
| @@ -3545,7 +3544,11 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object, | |||
| 3545 | enum resource_types); | 3544 | enum resource_types); |
| 3546 | extern char *x_get_string_resource (XrmDatabase, const char *, | 3545 | extern char *x_get_string_resource (XrmDatabase, const char *, |
| 3547 | const char *); | 3546 | const char *); |
| 3547 | |||
| 3548 | #ifndef HAVE_NS /* These both used on W32 and X only. */ | ||
| 3549 | extern bool x_mouse_grabbed (Display_Info *); | ||
| 3548 | extern void x_redo_mouse_highlight (Display_Info *); | 3550 | extern void x_redo_mouse_highlight (Display_Info *); |
| 3551 | #endif /* HAVE_NS */ | ||
| 3549 | 3552 | ||
| 3550 | #endif /* HAVE_WINDOW_SYSTEM */ | 3553 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 3551 | 3554 | ||