diff options
author | Eli Zaretskii <[email protected]> | 2013-12-17 19:46:31 +0200 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2013-12-17 19:46:31 +0200 |
commit | af025ae850c8f30431cf79876c4452d9f1679250 (patch) | |
tree | 708b8ba45eaffd8e9b3b28d7dec0192d2a517bd7 /src/fileio.c | |
parent | cf2b7efc78f0004a58b14a1eb470a306a139197d (diff) |
Fix some warnings in w32 specific code.
src/w32term.c (w32_initialize): Declare the argument of
set_user_model as const.
src/w32menu.c <MessageBoxW_Proc>: Fix argument declarations.
(w32_menu_show): Constify some arguments passed to MessageBox.
src/w32uniscribe.c (uniscribe_font_driver): Use LISP_INITIALLY_ZERO
to initialize Lisp objects.
src/w32font.c (w32font_driver): Use LISP_INITIALLY_ZERO to
initialize Lisp objects.
src/frame.c (x_set_frame_parameters) [HAVE_X_WINDOWS]: Declare and
use variables used only on X under that condition.
src/fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows
variables not used there.
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 47736d2b1b..295d9d748a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1942,10 +1942,7 @@ attributes of FILE to NEWNAME, such as its SELinux context and ACL entries (depending on how Emacs was built). */) (Lisp_Object file, Lisp_Object newname, Lisp_Object ok_if_already_exists, Lisp_Object keep_time, Lisp_Object preserve_uid_gid, Lisp_Object preserve_extended_attributes) { - int ifd, ofd; - int n; - char buf[16 * 1024]; - struct stat st, out_st; + struct stat out_st; Lisp_Object handler; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; ptrdiff_t count = SPECPDL_INDEX (); @@ -1956,6 +1953,11 @@ entries (depending on how Emacs was built). */) #endif #ifdef WINDOWSNT int result; +#else + int ifd, ofd; + int n; + char buf[16 * 1024]; + struct stat st; #endif encoded_file = encoded_newname = Qnil; |