diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-06-09 16:28:01 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-06-09 16:28:01 (GMT) |
| commit | dbeaa699cd6056a8e72c3275c5cf863b6fec8f64 (patch) | |
| tree | 12962da6bd8b690163664055368cc7c99d781128 | |
| parent | 91c64a05d2536cbe764cb94c3e24f021d34f7d9a (diff) | |
| download | cpython-dbeaa699cd6056a8e72c3275c5cf863b6fec8f64.zip cpython-dbeaa699cd6056a8e72c3275c5cf863b6fec8f64.tar.gz cpython-dbeaa699cd6056a8e72c3275c5cf863b6fec8f64.tar.bz2 | |
Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005.
Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick.
| -rw-r--r-- | Modules/posixmodule.c | 2 | ||||
| -rw-r--r-- | PC/pyconfig.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index c0280de..12e1c83 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1227,7 +1227,9 @@ _pystat_fromstructstat(STRUCT_STAT *st) #define ISSLASHA(c) ((c) == '\\' || (c) == '/') #define ISSLASHW(c) ((c) == L'\\' || (c) == L'/') +#ifndef ARRAYSIZE #define ARRAYSIZE(a) (sizeof(a) / sizeof(a[0])) +#endif static BOOL IsUNCRootA(char *path, int pathlen) diff --git a/PC/pyconfig.h b/PC/pyconfig.h index cb42131..14a32db 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -164,6 +164,12 @@ typedef int pid_t; #define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) #define Py_IS_FINITE(X) _finite(X) +/* Turn off warnings about deprecated C runtime functions in + VisualStudio .NET 2005 */ +#if _MSC_VER >= 1400 && !defined _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE +#endif + #endif /* _MSC_VER */ /* define some ANSI types that are not defined in earlier Win headers */ |