[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (ICC)

[victor.stinner]

https://hg.python.org/cpython/rev/c9dbfd8edcaa
changeset:   97634:c9dbfd8edcaa
branch:      3.5
parent:      97631:863407e80370
parent:      97633:94f61fe22edf
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Sep 03 21:32:44 2015 +0200
summary:
  Merge 3.4 (ICC)

files:
  Modules/posixmodule.c |  12 ++++--------
  1 files changed, 4 insertions(+), 8 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -4560,9 +4560,7 @@
     } \
 
 
-#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 @@
     #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 @@
     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

-- 
Repository URL: https://hg.python.org/cpython