=== modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-30 17:51:28 +0000 +++ src/ChangeLog 2013-12-30 22:36:44 +0000 @@ -1,3 +1,8 @@ +2013-12-30 Juanma Barranquero + + * fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows + variables not used there. + 2013-12-30 Eli Zaretskii * w32.c (sys_umask): New function. (Bug#16299) === modified file 'src/fileio.c' --- src/fileio.c 2013-12-29 18:18:45 +0000 +++ src/fileio.c 2013-12-30 22:36:44 +0000 @@ -1943,15 +1943,15 @@ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; ptrdiff_t count = SPECPDL_INDEX (); Lisp_Object encoded_file, encoded_newname; +#if HAVE_LIBSELINUX + security_context_t con; + int conlength = 0; +#endif +#ifdef WINDOWSNT + int result; +#else bool already_exists = false; mode_t new_mask; -#if HAVE_LIBSELINUX - security_context_t con; - int conlength = 0; -#endif -#ifdef WINDOWSNT - int result; -#else int ifd, ofd; int n; char buf[16 * 1024];