diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-03 19:34:03 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-03 19:34:03 (GMT) |
| commit | fed0931de42ae75e06834441f9015a7439820118 (patch) | |
| tree | f33a1fb8048952195cb6819417c16143f42fd1fc | |
| parent | f4951059f2331e5da4fa50d5b05080b21cce23f2 (diff) | |
| parent | 5b6917e60d2ffc0a87a6a17c234ba143a480dd82 (diff) | |
| download | cpython-fed0931de42ae75e06834441f9015a7439820118.zip cpython-fed0931de42ae75e06834441f9015a7439820118.tar.gz cpython-fed0931de42ae75e06834441f9015a7439820118.tar.bz2 | |
Merge 3.5 (ICC)
| -rw-r--r-- | Modules/posixmodule.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 4d25ed1..d2b8dfd 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -4560,9 +4560,7 @@ typedef struct { } \ -#define UTIME_HAVE_DIR_FD (defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)) - -#if UTIME_HAVE_DIR_FD +#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT) static int 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 #endif -#define UTIME_HAVE_FD (defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)) - -#if UTIME_HAVE_FD +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS) static int utime_fd(utime_t *ut, int fd) @@ -4835,13 +4831,13 @@ os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times, else #endif -#if UTIME_HAVE_DIR_FD +#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT) if ((dir_fd != DEFAULT_DIR_FD) || (!follow_symlinks)) result = utime_dir_fd(&utime, dir_fd, path->narrow, follow_symlinks); else #endif -#if UTIME_HAVE_FD +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS) if (path->fd != -1) result = utime_fd(&utime, path->fd); else |