aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2013-12-15 18:40:44 +0100
committerJuanma Barranquero2013-12-15 18:40:44 +0100
commit119f64dbf65b14c54cd26e64386ccb2e2a7091fc (patch)
tree1c481b812ef9953015a50886b1a4ae09879a09cc /src
parentcdeb10ce512b9b579add9dc358d90e1ab6475f6e (diff)
downloademacs-119f64dbf65b14c54cd26e64386ccb2e2a7091fc.tar.gz
emacs-119f64dbf65b14c54cd26e64386ccb2e2a7091fc.zip
src/w32*.c: Silence compiler warnings.
* w32fns.c (Fw32_shell_execute): Remove unused local variable. (Fx_file_dialog): Add parentheses around && to silence warning. * w32term.c (construct_drag_n_drop): Remove unused local variable.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/w32fns.c6
-rw-r--r--src/w32term.c2
3 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 90b6525a55d..1b19a309c04 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-12-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32fns.c (Fw32_shell_execute): Remove unused local variable.
4 (Fx_file_dialog): Add parentheses around && to silence warning.
5
6 * w32term.c (construct_drag_n_drop): Remove unused local variable.
7
12013-12-15 Eli Zaretskii <eliz@gnu.org> 82013-12-15 Eli Zaretskii <eliz@gnu.org>
2 9
3 * xdisp.c (extend_face_to_end_of_line): Extend background of 10 * xdisp.c (extend_face_to_end_of_line): Extend background of
diff --git a/src/w32fns.c b/src/w32fns.c
index e5d899d8a15..8576d478e42 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6667,9 +6667,9 @@ Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
6667 6667
6668 /* Strip the dummy filename off the end of the string if we 6668 /* Strip the dummy filename off the end of the string if we
6669 added it to select a directory. */ 6669 added it to select a directory. */
6670 if (use_unicode && file_details_w->nFilterIndex == 2 6670 if ((use_unicode && file_details_w->nFilterIndex == 2)
6671#ifndef NTGUI_UNICODE 6671#ifndef NTGUI_UNICODE
6672 || !use_unicode && file_details_a->nFilterIndex == 2 6672 || (!use_unicode && file_details_a->nFilterIndex == 2)
6673#endif 6673#endif
6674 ) 6674 )
6675 filename = Ffile_name_directory (filename); 6675 filename = Ffile_name_directory (filename);
@@ -6965,8 +6965,6 @@ an integer representing a ShowWindow flag:
6965 } 6965 }
6966 if (STRINGP (parameters)) 6966 if (STRINGP (parameters))
6967 { 6967 {
6968 int len;
6969
6970 parameters = ENCODE_SYSTEM (parameters); 6968 parameters = ENCODE_SYSTEM (parameters);
6971 params_a = SSDATA (parameters); 6969 params_a = SSDATA (parameters);
6972 } 6970 }
diff --git a/src/w32term.c b/src/w32term.c
index 6537b2205fe..e3cdc1d0838 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3137,7 +3137,7 @@ construct_drag_n_drop (struct input_event *result, W32Msg *msg, struct frame *f)
3137 char name_a[MAX_PATH]; 3137 char name_a[MAX_PATH];
3138 char file[MAX_UTF8_PATH]; 3138 char file[MAX_UTF8_PATH];
3139#endif 3139#endif
3140 int i, len; 3140 int i;
3141 3141
3142 result->kind = DRAG_N_DROP_EVENT; 3142 result->kind = DRAG_N_DROP_EVENT;
3143 result->code = 0; 3143 result->code = 0;