[Python-checkins] cpython (merge 3.4 -> default): #22568: merge with 3.4

georg.brandl python-checkins at python.org
Sun Oct 12 08:45:35 CEST 2014


https://hg.python.org/cpython/rev/0b2c7ea86d96
changeset:   92972:0b2c7ea86d96
parent:      92970:558d7fb48d74
parent:      92971:922526816b25
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 12 08:45:26 2014 +0200
summary:
  #22568: merge with 3.4

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


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6053,25 +6053,25 @@
     } \
 
 #define UTIME_TO_UTIMBUF \
-    struct utimbuf u[2]; \
+    struct utimbuf u; \
     struct utimbuf *time; \
     if (ut->now) \
         time = NULL; \
     else { \
-        u[0].actime = ut->atime_s; \
-        u[0].modtime = ut->mtime_s; \
-        time = u; \
+        u.actime = ut->atime_s; \
+        u.modtime = ut->mtime_s; \
+        time = &u; \
     }
 
 #define UTIME_TO_TIME_T \
     time_t timet[2]; \
-    struct timet time; \
+    time_t *time; \
     if (ut->now) \
         time = NULL; \
     else { \
         timet[0] = ut->atime_s; \
         timet[1] = ut->mtime_s; \
-        time = &timet; \
+        time = timet; \
     } \
 
 

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


More information about the Python-checkins mailing list