aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-23 19:11:18 +0100
committerJuanma Barranquero2014-03-23 19:11:18 +0100
commit17bf44f864d27f44ab8d6da85f872903020cf399 (patch)
treeff9bb2266b6d271a96cf9f05855f1dad63179663 /src
parent74b1f21db316d3c9c07df2796afd11de87ea8bb2 (diff)
downloademacs-17bf44f864d27f44ab8d6da85f872903020cf399.tar.gz
emacs-17bf44f864d27f44ab8d6da85f872903020cf399.zip
src/w32fns.c (Fw32_shell_execute): Declare `result' only on Cygwin.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dc07ba0b320..8b74e921450 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-03-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32fns.c (Fw32_shell_execute): Declare `result' only on Cygwin.
4
12014-03-23 Daniel Colascione <dancol@dancol.org> 52014-03-23 Daniel Colascione <dancol@dancol.org>
2 6
3 * xfns.c (create_frame_xic): Pass XNStatusAttributes to XCreateIC 7 * xfns.c (create_frame_xic): Pass XNStatusAttributes to XCreateIC
diff --git a/src/w32fns.c b/src/w32fns.c
index fff1e3efde6..9dab1408b49 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6913,8 +6913,9 @@ a ShowWindow flag:
6913 char *errstr; 6913 char *errstr;
6914 Lisp_Object current_dir = BVAR (current_buffer, directory);; 6914 Lisp_Object current_dir = BVAR (current_buffer, directory);;
6915 wchar_t *doc_w = NULL, *params_w = NULL, *ops_w = NULL; 6915 wchar_t *doc_w = NULL, *params_w = NULL, *ops_w = NULL;
6916#ifdef CYGWIN
6916 intptr_t result; 6917 intptr_t result;
6917#ifndef CYGWIN 6918#else
6918 int use_unicode = w32_unicode_filenames; 6919 int use_unicode = w32_unicode_filenames;
6919 char *doc_a = NULL, *params_a = NULL, *ops_a = NULL; 6920 char *doc_a = NULL, *params_a = NULL, *ops_a = NULL;
6920 Lisp_Object absdoc, handler; 6921 Lisp_Object absdoc, handler;