Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Patch #623780: Replace obsolete struct macros.

This commit is contained in:
Martin v. Löwis 2002-10-16 20:28:25 +00:00
parent 98ef20d5e4
commit 60a5d72908
5 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/posixmodule.c
View File

@ -685,31 +685,31 @@ static PyStructSequence_Field stat_result_fields[] = {
{"st_atime", "time of last access"}, {"st_atime", "time of last access"},
{"st_mtime", "time of last modification"}, {"st_mtime", "time of last modification"},
{"st_ctime", "time of last change"}, {"st_ctime", "time of last change"},
#ifdef HAVE_ST_BLKSIZE #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
{"st_blksize", "blocksize for filesystem I/O"}, {"st_blksize", "blocksize for filesystem I/O"},
#endif #endif
#ifdef HAVE_ST_BLOCKS #ifdef HAVE_STRUCT_STAT_ST_BLOCKS
{"st_blocks", "number of blocks allocated"}, {"st_blocks", "number of blocks allocated"},
#endif #endif
#ifdef HAVE_ST_RDEV #ifdef HAVE_STRUCT_STAT_ST_RDEV
{"st_rdev", "device type (if inode device)"}, {"st_rdev", "device type (if inode device)"},
#endif #endif
{0} {0}
}; };
#ifdef HAVE_ST_BLKSIZE #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
#define ST_BLKSIZE_IDX 13 #define ST_BLKSIZE_IDX 13
#else #else
#define ST_BLKSIZE_IDX 12 #define ST_BLKSIZE_IDX 12
#endif #endif
#ifdef HAVE_ST_BLOCKS #ifdef HAVE_STRUCT_STAT_ST_BLOCKS
#define ST_BLOCKS_IDX (ST_BLKSIZE_IDX+1) #define ST_BLOCKS_IDX (ST_BLKSIZE_IDX+1)
#else #else
#define ST_BLOCKS_IDX ST_BLKSIZE_IDX #define ST_BLOCKS_IDX ST_BLKSIZE_IDX
#endif #endif
#ifdef HAVE_ST_RDEV #ifdef HAVE_STRUCT_STAT_ST_RDEV
#define ST_RDEV_IDX (ST_BLOCKS_IDX+1) #define ST_RDEV_IDX (ST_BLOCKS_IDX+1)
#else #else
#define ST_RDEV_IDX ST_BLOCKS_IDX #define ST_RDEV_IDX ST_BLOCKS_IDX
@ -866,15 +866,15 @@ _pystat_fromstructstat(STRUCT_STAT st)
fill_time(v, 8, st.st_mtime, mnsec); fill_time(v, 8, st.st_mtime, mnsec);
fill_time(v, 9, st.st_ctime, cnsec); fill_time(v, 9, st.st_ctime, cnsec);
#ifdef HAVE_ST_BLKSIZE #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
PyStructSequence_SET_ITEM(v, ST_BLKSIZE_IDX, PyStructSequence_SET_ITEM(v, ST_BLKSIZE_IDX,
PyInt_FromLong((long)st.st_blksize)); PyInt_FromLong((long)st.st_blksize));
#endif #endif
#ifdef HAVE_ST_BLOCKS #ifdef HAVE_STRUCT_STAT_ST_BLOCKS
PyStructSequence_SET_ITEM(v, ST_BLOCKS_IDX, PyStructSequence_SET_ITEM(v, ST_BLOCKS_IDX,
PyInt_FromLong((long)st.st_blocks)); PyInt_FromLong((long)st.st_blocks));
#endif #endif
#ifdef HAVE_ST_RDEV #ifdef HAVE_STRUCT_STAT_ST_RDEV
PyStructSequence_SET_ITEM(v, ST_RDEV_IDX, PyStructSequence_SET_ITEM(v, ST_RDEV_IDX,
PyInt_FromLong((long)st.st_rdev)); PyInt_FromLong((long)st.st_rdev));
#endif #endif

4
Modules/timemodule.c
View File

@ -653,7 +653,7 @@ inittime(void)
PyModule_AddObject(m, "tzname", PyModule_AddObject(m, "tzname",
Py_BuildValue("(zz)", tzname[0], tzname[1])); Py_BuildValue("(zz)", tzname[0], tzname[1]));
#else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/ #else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
#ifdef HAVE_TM_ZONE #ifdef HAVE_STRUCT_TM_TM_ZONE
{ {
#define YEAR ((time_t)((365 * 24 + 6) * 3600)) #define YEAR ((time_t)((365 * 24 + 6) * 3600))
time_t t; time_t t;
@ -702,7 +702,7 @@ inittime(void)
PyModule_AddIntConstant(m, "daylight", 0); PyModule_AddIntConstant(m, "daylight", 0);
PyModule_AddObject(m, "tzname", Py_BuildValue("(zz)", "", "")); PyModule_AddObject(m, "tzname", Py_BuildValue("(zz)", "", ""));
#endif /* macintosh */ #endif /* macintosh */
#endif /* HAVE_TM_ZONE */ #endif /* HAVE_STRUCT_TM_TM_ZONE */
#ifdef __CYGWIN__ #ifdef __CYGWIN__
tzset(); tzset();
PyModule_AddIntConstant(m, "timezone", _timezone); PyModule_AddIntConstant(m, "timezone", _timezone);

14
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.356 . # From configure.in Revision: 1.357 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53. # Generated by GNU Autoconf 2.53.
# #
@ -13333,7 +13333,6 @@ _ACEOF
fi fi
fi fi
echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
@ -13388,14 +13387,8 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_ST_RDEV 1
_ACEOF
fi fi
echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
@ -13450,13 +13443,8 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_ST_BLKSIZE 1
_ACEOF
fi fi
echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then

4
configure.in
View File

@ -1860,8 +1860,8 @@ AC_CHECK_FUNCS(getnameinfo)
AC_HEADER_TIME AC_HEADER_TIME
AC_STRUCT_TM AC_STRUCT_TM
AC_STRUCT_TIMEZONE AC_STRUCT_TIMEZONE
AC_STRUCT_ST_RDEV AC_CHECK_MEMBERS([struct stat.st_rdev])
AC_STRUCT_ST_BLKSIZE AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_STRUCT_ST_BLOCKS AC_STRUCT_ST_BLOCKS
AC_MSG_CHECKING(for time.h that defines altzone) AC_MSG_CHECKING(for time.h that defines altzone)

8
pyconfig.h.in
View File

@ -440,18 +440,10 @@
/* Define to 1 if `tm_zone' is member of `struct tm'. */ /* Define to 1 if `tm_zone' is member of `struct tm'. */
#undef HAVE_STRUCT_TM_TM_ZONE #undef HAVE_STRUCT_TM_TM_ZONE
/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
`HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
#undef HAVE_ST_BLKSIZE
/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use /* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
`HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
#undef HAVE_ST_BLOCKS #undef HAVE_ST_BLOCKS
/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
`HAVE_STRUCT_STAT_ST_RDEV' instead. */
#undef HAVE_ST_RDEV
/* Define to 1 if you have the `symlink' function. */ /* Define to 1 if you have the `symlink' function. */
#undef HAVE_SYMLINK #undef HAVE_SYMLINK