aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-12-30 23:36:44 +0100
committerJuanma Barranquero2013-12-30 23:36:44 +0100
commit2db9da01bd31b9840ff859486bb4820dc7a837aa (patch)
treebe4b83294d3795dfe3fa796eae935b11b1631b1b
parent9d1804dcb8b711a6d7eee16f0f54f3d418e2cb53 (diff)
downloademacs-2db9da01bd31b9840ff859486bb4820dc7a837aa.tar.gz
emacs-2db9da01bd31b9840ff859486bb4820dc7a837aa.zip
src/fileio.c: Silence compiler warnings.
* fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows variables not used there.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 18d00ef7640..bfc4ac548c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-12-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows
4 variables not used there.
5
12013-12-30 Eli Zaretskii <eliz@gnu.org> 62013-12-30 Eli Zaretskii <eliz@gnu.org>
2 7
3 * w32.c (sys_umask): New function. (Bug#16299) 8 * w32.c (sys_umask): New function. (Bug#16299)
diff --git a/src/fileio.c b/src/fileio.c
index adf69c6f234..6b40cad3fbb 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1943,8 +1943,6 @@ permissions. */)
1943 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; 1943 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
1944 ptrdiff_t count = SPECPDL_INDEX (); 1944 ptrdiff_t count = SPECPDL_INDEX ();
1945 Lisp_Object encoded_file, encoded_newname; 1945 Lisp_Object encoded_file, encoded_newname;
1946 bool already_exists = false;
1947 mode_t new_mask;
1948#if HAVE_LIBSELINUX 1946#if HAVE_LIBSELINUX
1949 security_context_t con; 1947 security_context_t con;
1950 int conlength = 0; 1948 int conlength = 0;
@@ -1952,6 +1950,8 @@ permissions. */)
1952#ifdef WINDOWSNT 1950#ifdef WINDOWSNT
1953 int result; 1951 int result;
1954#else 1952#else
1953 bool already_exists = false;
1954 mode_t new_mask;
1955 int ifd, ofd; 1955 int ifd, ofd;
1956 int n; 1956 int n;
1957 char buf[16 * 1024]; 1957 char buf[16 * 1024];