diff options
| author | Juanma Barranquero | 2011-03-14 18:07:53 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-14 18:07:53 +0100 |
| commit | 7684e57b24092dbfbbe7fc62a1a544e40e2ce88a (patch) | |
| tree | fee092544c95e422483f41079d1bfd9dfdd6248f /src/w32term.c | |
| parent | e756ec02a4415f054cac4887a1b03ae4d7ed6ccb (diff) | |
| download | emacs-7684e57b24092dbfbbe7fc62a1a544e40e2ce88a.tar.gz emacs-7684e57b24092dbfbbe7fc62a1a544e40e2ce88a.zip | |
src/w32*.c: Clean up extern declarations.
* w32select.c: Don't #include "keyboard.h".
(run_protected): Add extern declaration for waiting_for_input.
* lisp.h (VWindow_system, Qfile_name_history):
* keyboard.h (lispy_function_keys) [WINDOWSNT]:
* w32term.h (w32_system_caret_hwnd, w32_system_caret_height)
(w32_system_caret_x, w32_system_caret_y): Declare extern.
* w32.c (Qlocal, noninteractive1, inhibit_window_system):
* w32console.c (detect_input_pending, read_input_pending)
(encode_terminal_code):
* w32fns.c (quit_char, lispy_function_keys, Qtooltip)
(w32_system_caret_hwnd, w32_system_caret_height, w32_system_caret_x)
(w32_system_caret_y, Qfile_name_history):
* w32font.c (w32font_driver, QCantialias, QCotf, QClang):
* w32inevt.c (reinvoke_input_signal, lispy_function_keys):
* w32menu.c (Qmenu_bar, QCtoggle, QCradio, Qoverriding_local_map)
(Qoverriding_terminal_local_map, Qmenu_bar_update_hook):
* w32proc.c (Qlocal, report_file_error):
* w32term.c (Vwindow_system, updating_frame):
* w32uniscribe.c (initialized, uniscribe_font_driver):
Remove unneeded extern declarations.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/w32term.c b/src/w32term.c index 67e853f21f0..f31c4e90e77 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -88,8 +88,6 @@ extern void free_frame_menubar (struct frame *); | |||
| 88 | extern int w32_codepage_for_font (char *fontname); | 88 | extern int w32_codepage_for_font (char *fontname); |
| 89 | extern Cursor w32_load_cursor (LPCTSTR name); | 89 | extern Cursor w32_load_cursor (LPCTSTR name); |
| 90 | 90 | ||
| 91 | extern Lisp_Object Vwindow_system; | ||
| 92 | |||
| 93 | #define x_any_window_to_frame x_window_to_frame | 91 | #define x_any_window_to_frame x_window_to_frame |
| 94 | #define x_top_window_to_frame x_window_to_frame | 92 | #define x_top_window_to_frame x_window_to_frame |
| 95 | 93 | ||
| @@ -138,13 +136,6 @@ BOOL (WINAPI *pfnSetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD); | |||
| 138 | #define WS_EX_LAYERED 0x80000 | 136 | #define WS_EX_LAYERED 0x80000 |
| 139 | #endif | 137 | #endif |
| 140 | 138 | ||
| 141 | /* Frame being updated by update_frame. This is declared in term.c. | ||
| 142 | This is set by update_begin and looked at by all the | ||
| 143 | w32 functions. It is zero while not inside an update. | ||
| 144 | In that case, the w32 functions assume that `SELECTED_FRAME ()' | ||
| 145 | is the frame to apply to. */ | ||
| 146 | extern struct frame *updating_frame; | ||
| 147 | |||
| 148 | /* This is a frame waiting to be autoraised, within w32_read_socket. */ | 139 | /* This is a frame waiting to be autoraised, within w32_read_socket. */ |
| 149 | struct frame *pending_autoraise_frame; | 140 | struct frame *pending_autoraise_frame; |
| 150 | 141 | ||
| @@ -2536,8 +2527,7 @@ x_delete_glyphs (struct frame *f, register int n) | |||
| 2536 | } | 2527 | } |
| 2537 | 2528 | ||
| 2538 | 2529 | ||
| 2539 | /* Clear entire frame. If updating_frame is non-null, clear that | 2530 | /* Clear entire frame. */ |
| 2540 | frame. Otherwise clear the selected frame. */ | ||
| 2541 | 2531 | ||
| 2542 | static void | 2532 | static void |
| 2543 | x_clear_frame (struct frame *f) | 2533 | x_clear_frame (struct frame *f) |
| @@ -6060,7 +6050,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo) | |||
| 6060 | terminal->mouse_position_hook = w32_mouse_position; | 6050 | terminal->mouse_position_hook = w32_mouse_position; |
| 6061 | terminal->frame_rehighlight_hook = w32_frame_rehighlight; | 6051 | terminal->frame_rehighlight_hook = w32_frame_rehighlight; |
| 6062 | terminal->frame_raise_lower_hook = w32_frame_raise_lower; | 6052 | terminal->frame_raise_lower_hook = w32_frame_raise_lower; |
| 6063 | // terminal->fullscreen_hook = XTfullscreen_hook; | 6053 | /* terminal->fullscreen_hook = XTfullscreen_hook; */ |
| 6064 | terminal->set_vertical_scroll_bar_hook = w32_set_vertical_scroll_bar; | 6054 | terminal->set_vertical_scroll_bar_hook = w32_set_vertical_scroll_bar; |
| 6065 | terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars; | 6055 | terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars; |
| 6066 | terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar; | 6056 | terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar; |