[Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.224,2.225 import.c,2.182,2.183
Martin v. L?wis
loewis@users.sourceforge.net
2001年8月08日 03:28:08 -0700
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv31287/Python
Modified Files:
bltinmodule.c import.c
Log Message:
Put conditional S_ISDIR definition(s) into pyport.h.
Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.224
retrieving revision 2.225
diff -C2 -d -r2.224 -r2.225
*** bltinmodule.c 2001年08月08日 06:24:48 2.224
--- bltinmodule.c 2001年08月08日 10:28:06 2.225
***************
*** 593,597 ****
/* Test for existence or directory. */
if (!stat(filename, &s)) {
! if ((s.st_mode & S_IFMT) == S_IFDIR)
errno = EISDIR;
else
--- 593,597 ----
/* Test for existence or directory. */
if (!stat(filename, &s)) {
! if (S_ISDIR(s.st_mode))
errno = EISDIR;
else
Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.182
retrieving revision 2.183
diff -C2 -d -r2.182 -r2.183
*** import.c 2001年08月04日 08:12:36 2.182
--- import.c 2001年08月08日 10:28:06 2.183
***************
*** 29,36 ****
#endif
- #ifndef S_ISDIR
- #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
- #endif
-
extern time_t PyOS_GetLastModificationTime(char *, FILE *);
/* In getmtime.c */
--- 29,32 ----