Merge 3.4 (ICC)

diff --cc Modules/posixmodule.c
index ec8c526c0aac96469fb0acb62ace1a7fae192923,f22168d318553584215e9726058d8c57c6c3aa2d..d8bb06087de3bc2a052aaef85db71f22f48e4a7a
--- 1/Modules/posixmodule.c
--- 2/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