mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	#22568: merge with 3.4
This commit is contained in:
		
						commit
						bfd7881aa6
					
				
					 1 changed files with 6 additions and 6 deletions
				
			
		| 
						 | 
					@ -6053,25 +6053,25 @@ typedef struct {
 | 
				
			||||||
    } \
 | 
					    } \
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define UTIME_TO_UTIMBUF \
 | 
					#define UTIME_TO_UTIMBUF \
 | 
				
			||||||
    struct utimbuf u[2]; \
 | 
					    struct utimbuf u; \
 | 
				
			||||||
    struct utimbuf *time; \
 | 
					    struct utimbuf *time; \
 | 
				
			||||||
    if (ut->now) \
 | 
					    if (ut->now) \
 | 
				
			||||||
        time = NULL; \
 | 
					        time = NULL; \
 | 
				
			||||||
    else { \
 | 
					    else { \
 | 
				
			||||||
        u[0].actime = ut->atime_s; \
 | 
					        u.actime = ut->atime_s; \
 | 
				
			||||||
        u[0].modtime = ut->mtime_s; \
 | 
					        u.modtime = ut->mtime_s; \
 | 
				
			||||||
        time = u; \
 | 
					        time = &u; \
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define UTIME_TO_TIME_T \
 | 
					#define UTIME_TO_TIME_T \
 | 
				
			||||||
    time_t timet[2]; \
 | 
					    time_t timet[2]; \
 | 
				
			||||||
    struct timet time; \
 | 
					    time_t *time; \
 | 
				
			||||||
    if (ut->now) \
 | 
					    if (ut->now) \
 | 
				
			||||||
        time = NULL; \
 | 
					        time = NULL; \
 | 
				
			||||||
    else { \
 | 
					    else { \
 | 
				
			||||||
        timet[0] = ut->atime_s; \
 | 
					        timet[0] = ut->atime_s; \
 | 
				
			||||||
        timet[1] = ut->mtime_s; \
 | 
					        timet[1] = ut->mtime_s; \
 | 
				
			||||||
        time = &timet; \
 | 
					        time = timet; \
 | 
				
			||||||
    } \
 | 
					    } \
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue