From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 3 Sep 2015 19:32:44 +0000 (+0200)
Subject: Merge 3.4 (ICC)
X-Git-Tag: v3.6.0a1~1681^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b6917e60d2ffc0a87a6a17c234ba143a480dd82;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (ICC)
---

5b6917e60d2ffc0a87a6a17c234ba143a480dd82
diff --cc Modules/posixmodule.c
index ec8c526c0aac,f22168d31855..d8bb06087de3
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@@ -4583,14 -4802,9 +4581,12 @@@ utime_dir_fd(utime_t *ut, int dir_fd, c
  #endif
  }
  
 +    #define FUTIMENSAT_DIR_FD_CONVERTER dir_fd_converter
 +#else
 +    #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,15 -5031,15 +4831,15 @@@ os_utime_impl(PyModuleDef *module, path
      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);
 +        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);
 +    if (path->fd != -1)
 +        result = utime_fd(&utime, path->fd);
      else
  #endif