changeset: 71123:45b27448f95c branch: 2.7 parent: 71114:ff36b8cadfd6 user: Antoine Pitrou date: Fri Jul 01 22:56:03 2011 +0200 files: Modules/posixmodule.c description: Really fix issue #10898: posixmodule.c redefines FSTAT diff -r ff36b8cadfd6 -r 45b27448f95c Modules/posixmodule.c --- a/Modules/posixmodule.c Fri Jul 01 15:04:03 2011 +0200 +++ b/Modules/posixmodule.c Fri Jul 01 22:56:03 2011 +0200 @@ -338,20 +338,6 @@ #define USE_TMPNAM_R #endif -/* choose the appropriate stat and fstat functions and return structs */ -#undef STAT -#undef FSTAT -#undef STRUCT_STAT -#if defined(MS_WIN64) || defined(MS_WINDOWS) -# define STAT win32_stat -# define FSTAT win32_fstat -# define STRUCT_STAT struct win32_stat -#else -# define STAT stat -# define FSTAT fstat -# define STRUCT_STAT struct stat -#endif - #if defined(MAJOR_IN_MKDEV) #include #else @@ -842,6 +828,20 @@ } #endif +/* choose the appropriate stat and fstat functions and return structs */ +#undef STAT +#undef FSTAT +#undef STRUCT_STAT +#if defined(MS_WIN64) || defined(MS_WINDOWS) +# define STAT win32_stat +# define FSTAT win32_fstat +# define STRUCT_STAT struct win32_stat +#else +# define STAT stat +# define FSTAT fstat +# define STRUCT_STAT struct stat +#endif + #ifdef MS_WINDOWS /* The CRT of Windows has a number of flaws wrt. its stat() implementation: - time stamps are restricted to second resolution