Skip to content

C
cpython
Kaydet (Commit) 5b6917e6 authored tarafından Victor Stinner's avatar Victor Stinner
Dosyalara gözat
Seçenekler

Merge 3.4 (ICC)

üst fda673d5 528a9ab1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
Modules/posixmodule.c
Dosyayı görüntüle @ 5b6917e6
...@@ -4560,9 +4560,7 @@ typedef struct { ...@@ -4560,9 +4560,7 @@ typedef struct {
} \ } \
#define UTIME_HAVE_DIR_FD (defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)) #if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)
#if UTIME_HAVE_DIR_FD
static int static int
utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks) utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks)
...@@ -4588,9 +4586,7 @@ utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks) ...@@ -4588,9 +4586,7 @@ utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks)
#define FUTIMENSAT_DIR_FD_CONVERTER dir_fd_unavailable #define FUTIMENSAT_DIR_FD_CONVERTER dir_fd_unavailable
#endif #endif
#define UTIME_HAVE_FD (defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)) #if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)
#if UTIME_HAVE_FD
static int static int
utime_fd(utime_t *ut, int fd) utime_fd(utime_t *ut, int fd)
...@@ -4835,13 +4831,13 @@ os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times, ...@@ -4835,13 +4831,13 @@ os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times,
else else
#endif #endif
#if UTIME_HAVE_DIR_FD #if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)
if ((dir_fd != DEFAULT_DIR_FD) || (!follow_symlinks)) if ((dir_fd != DEFAULT_DIR_FD) || (!follow_symlinks))
result = utime_dir_fd(&utime, dir_fd, path->narrow, follow_symlinks); result = utime_dir_fd(&utime, dir_fd, path->narrow, follow_symlinks);
else else
#endif #endif
#if UTIME_HAVE_FD #if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)
if (path->fd != -1) if (path->fd != -1)
result = utime_fd(&utime, path->fd); result = utime_fd(&utime, path->fd);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment