diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 4 |
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 @@ | |||
| 1 | 2013-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 | |||
| 1 | 2013-12-30 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-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]; |