diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-10-22 19:52:18 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-10-22 19:52:18 +0300 |
| commit | d4352f813a0703cc7f7a873525131b272ef0c105 (patch) | |
| tree | 8fa21fa5d0bfecb3e25bf6453c952c43eb7b8de5 /src/w32select.c | |
| parent | 11d14229dc96d8b44b78a2f35ac0011fbd0f527f (diff) | |
| download | emacs-d4352f813a0703cc7f7a873525131b272ef0c105.tar.gz emacs-d4352f813a0703cc7f7a873525131b272ef0c105.tar.bz2 emacs-d4352f813a0703cc7f7a873525131b272ef0c105.zip | |
Include file cleanup for w32 files in src directory
* src/w32xfns.c: Don't include keyboard.h, window.h, charset.h,
fontset.h, blockinput.h.
* src/w32uniscribe.c: Don't include dispextern.h, character.h,
charset.h, fontset.h.
* src/w32term.c: Don't include systty.h, systime.h, charset.h,
character.h, ccl.h, dispextern.h, disptab.h, intervals.h,
process.h, atimer.h, keymap.h, w32heap.h. Include bitmap/gray.xbm
in an ifdef-ed away block.
Include fcntl.h for CYGWIN.
(set_frame_param): Remove unused function.
* src/w32select.c: Don't include charset.h and composite.h.
(setup_config, Fw32_get_clipboard_data): Avoid compiler warnings
due to pointer signedness mismatches.
* src/w32reg.c (w32_get_string_resource): Avoid compiler warnings
due to pointer signedness mismatches.
* src/w32proc.c: Include unistd.h. Don't include systime.h,
process.h, dispextern.h.
(sys_spawnve, Fw32_short_file_name, Fw32_long_file_name)
(Fw32_application_type): Avoid compiler warnings due to pointer
signedness mismatches.
* src/w32menu.c: Don't include keymap.h, termhooks.h, window.h,
character.h, charset.h, dispextern.h.
(simple_dialog_show, add_menu_item): Avoid compiler warnings due
to pointer signedness mismatches.
* src/w32inevt.c: Don't include dispextern.h, window.h,
termhooks.h, w32heap.h.
* src/w32font.c: Don't include dispextern.h, character.h,
charset.h, fontset.h, font.h.
(intern_font_name, add_font_entity_to_list)
(registry_to_w32_charset, w32_to_x_charset, fill_in_logfont)
(list_all_matching_fonts): Avoid compiler warnings due to pointer
signedness mismatches.
* src/w32fns.c: Don't include character.h, intervals.h,
dispextern.h, epaths.h, charset.h, ccl.h, fontset.h, systime.h,
termhooks.h, w32heap.h, bitmap/gray.xbm, font.h, w32font.h.
(w32_color_map_lookup, add_system_logical_colors_to_map)
(x_decode_color, x_set_name, FPRINTF_WM_CHARS, Fxw_color_defined_p)
(Fxw_color_values, x_display_info_for_name, Fset_message_beep)
(x_create_tip_frame, Fx_file_dialog, Fsystem_move_file_to_trash)
(w32_parse_hot_key, Ffile_system_info, w32_kbd_patch_key): Avoid
compiler warnings, mainly due to pointer signedness mismatches.
(unwind_create_frame_1): Remove unused function.
* src/w32console.c: Don't include character.h, disptab.h, frame.h,
window.h, termhooks.h, dispextern.h.
(w32con_write_glyphs, w32con_write_glyphs_with_face): Fix pointer
signedness mismatch.
* src/w32.c: Include c-strcase.h and systty.h. Don't include
w32heap.h.
Diffstat (limited to 'src/w32select.c')
| -rw-r--r-- | src/w32select.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/w32select.c b/src/w32select.c index 3c554c622ae..3962ac6cbed 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -76,11 +76,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "lisp.h" #include "w32common.h" /* os_subtype */ #include "w32term.h" /* for all of the w32 includes */ -#include "keyboard.h" +#include "keyboard.h" /* for waiting_for_input */ #include "blockinput.h" -#include "charset.h" #include "coding.h" -#include "composite.h" #ifdef CYGWIN #include <string.h> @@ -513,7 +511,7 @@ setup_config (void) cfg_clipboard_type = CF_TEXT; /* Interpret the coding system symbol name */ - coding_name = SDATA (SYMBOL_NAME (cfg_coding_system)); + coding_name = SSDATA (SYMBOL_NAME (cfg_coding_system)); /* "(.*-)?utf-16.*" -> CF_UNICODETEXT */ cp = strstr (coding_name, "utf-16"); @@ -857,7 +855,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, { int i; - nbytes = strlen (src); + nbytes = strlen ((char *)src); for (i = 0; i < nbytes; i++) { |