diff options
| author | Jan Djärv | 2009-09-04 04:40:17 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-09-04 04:40:17 +0000 |
| commit | 04f4b72d09798c0a14b2ba0fb17f53ffd5e1d3b3 (patch) | |
| tree | efdfe9eafe17b604a61669a9c1e61c55cfd455e1 | |
| parent | df1204818a023bdde46e36c8cfd878cf0937fab7 (diff) | |
| download | emacs-04f4b72d09798c0a14b2ba0fb17f53ffd5e1d3b3.tar.gz emacs-04f4b72d09798c0a14b2ba0fb17f53ffd5e1d3b3.zip | |
* xterm.h: Remove condition for declaration of
x_*_window_to_frame.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b8d21c5028a..4bbaf28cef1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-09-04 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xterm.h: Remove condition for declaration of | ||
| 4 | x_*_window_to_frame. | ||
| 5 | |||
| 1 | 2009-09-03 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2009-09-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * dispnew.c (Fsend_string_to_terminal): Make it work again on the | 8 | * dispnew.c (Fsend_string_to_terminal): Make it work again on the |
diff --git a/src/xterm.h b/src/xterm.h index 5e83ef87074..1019bbc8a7e 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -376,11 +376,9 @@ extern void check_x P_ ((void)); | |||
| 376 | 376 | ||
| 377 | extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); | 377 | extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); |
| 378 | 378 | ||
| 379 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | ||
| 380 | extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); | 379 | extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); |
| 381 | extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); | 380 | extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); |
| 382 | extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); | 381 | extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); |
| 383 | #endif | ||
| 384 | 382 | ||
| 385 | /* This is a chain of structures for all the X displays currently in use. */ | 383 | /* This is a chain of structures for all the X displays currently in use. */ |
| 386 | extern struct x_display_info *x_display_list; | 384 | extern struct x_display_info *x_display_list; |