[Python-checkins] python/dist/src/Modules _localemodule.c,2.33,2.34 posixmodule.c,2.241,2.242
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Sun, 14 Jul 2002 15:14:21 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv22290/python/Modules
Modified Files:
_localemodule.c posixmodule.c
Log Message:
WINDOWS_LEAN_AND_MEAN: There is no such symbol, although a very few
MSDN sample programs use it, apparently in error. The correct name
is WIN32_LEAN_AND_MEAN. After switching to the correct name, in two
cases more was needed because the code actually relied on things that
disappear when WIN32_LEAN_AND_MEAN is defined.
Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** _localemodule.c 30 Jun 2002 15:26:09 -0000 2.33
--- _localemodule.c 14 Jul 2002 22:14:18 -0000 2.34
***************
*** 27,31 ****
#if defined(MS_WINDOWS)
! #define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#endif
--- 27,31 ----
#if defined(MS_WINDOWS)
! #define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
Index: posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.241
retrieving revision 2.242
diff -C2 -d -r2.241 -r2.242
*** posixmodule.c 30 Jun 2002 15:26:09 -0000 2.241
--- posixmodule.c 14 Jul 2002 22:14:18 -0000 2.242
***************
*** 218,222 ****
#include <process.h>
#include "osdefs.h"
! #define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#define popen _popen
--- 218,222 ----
#include <process.h>
#include "osdefs.h"
! /* We don't want WIN32_LEAN_AND_MEAN here -- we need ShellExecute(). */
#include <windows.h>
#define popen _popen