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.
This commit is contained in:
parent
a81d220625
commit
7a1f91709b
|
@ -26,7 +26,7 @@ This software comes with no warranty. Use at your own risk.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MS_WINDOWS)
|
#if defined(MS_WINDOWS)
|
||||||
#define WINDOWS_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -217,7 +217,7 @@ extern int lstat(const char *, struct stat *);
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#include "osdefs.h"
|
#include "osdefs.h"
|
||||||
#define WINDOWS_LEAN_AND_MEAN
|
/* We don't want WIN32_LEAN_AND_MEAN here -- we need ShellExecute(). */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#define popen _popen
|
#define popen _popen
|
||||||
#define pclose _pclose
|
#define pclose _pclose
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#define fileno _fileno
|
#define fileno _fileno
|
||||||
/* can simulate truncate with Win32 API functions; see file_truncate */
|
/* can simulate truncate with Win32 API functions; see file_truncate */
|
||||||
#define HAVE_FTRUNCATE
|
#define HAVE_FTRUNCATE
|
||||||
#define WINDOWS_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,10 @@
|
||||||
* AKA solution to the problem described in KB: Q150956.
|
* AKA solution to the problem described in KB: Q150956.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WINDOWS_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h> /* for malloc and its friends */
|
||||||
|
|
||||||
const char *usage =
|
const char *usage =
|
||||||
"This program is used by Python's os.popen function\n"
|
"This program is used by Python's os.popen function\n"
|
||||||
|
|
Loading…
Reference in New Issue