From cc47df0b6268f25e9a01d8e9679646500020f227 Mon Sep 17 00:00:00 2001 From: Joshua Peisach Date: Fri, 8 Sep 2023 17:26:47 -0400 Subject: [PATCH] Revert "Define WIN32_LEAN_AND_MEAN when importing windows.h" This reverts commit 33048db81ab6b99c87a7cfbe83b2f6b8fb6e2802. This screws up the build. The context shouldn't change that much anyways --- LEGO1/dllmain.cpp | 4 ---- LEGO1/mxcriticalsection.h | 4 ---- LEGO1/mxdirectdraw.h | 4 ---- LEGO1/mxioinfo.h | 4 ---- LEGO1/mxomnicreateparam.h | 4 ---- LEGO1/mxsemaphore.h | 4 ---- LEGO1/mxtimer.h | 4 ---- LEGO1/mxvideoparamflags.h | 4 ---- 8 files changed, 32 deletions(-) diff --git a/LEGO1/dllmain.cpp b/LEGO1/dllmain.cpp index 1d5472a2..d4b7168b 100644 --- a/LEGO1/dllmain.cpp +++ b/LEGO1/dllmain.cpp @@ -1,7 +1,3 @@ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include // OFFSET: LEGO1 0x10091ee0 diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/mxcriticalsection.h index e3b1274a..81d96d37 100644 --- a/LEGO1/mxcriticalsection.h +++ b/LEGO1/mxcriticalsection.h @@ -1,10 +1,6 @@ #ifndef MXCRITICALSECTION_H #define MXCRITICALSECTION_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include class MxCriticalSection diff --git a/LEGO1/mxdirectdraw.h b/LEGO1/mxdirectdraw.h index ab91072c..3e2c710a 100644 --- a/LEGO1/mxdirectdraw.h +++ b/LEGO1/mxdirectdraw.h @@ -2,10 +2,6 @@ #ifndef MXDIRECTDRAW_H #define MXDIRECTDRAW_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include #include diff --git a/LEGO1/mxioinfo.h b/LEGO1/mxioinfo.h index ef737ae0..83da930a 100644 --- a/LEGO1/mxioinfo.h +++ b/LEGO1/mxioinfo.h @@ -1,10 +1,6 @@ #ifndef MXIOINFO_H #define MXIOINFO_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include #include diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/mxomnicreateparam.h index f5a5195c..31dcd447 100644 --- a/LEGO1/mxomnicreateparam.h +++ b/LEGO1/mxomnicreateparam.h @@ -1,10 +1,6 @@ #ifndef MXOMNICREATEPARAM_H #define MXOMNICREATEPARAM_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include #include "mxomnicreateflags.h" diff --git a/LEGO1/mxsemaphore.h b/LEGO1/mxsemaphore.h index eebb887e..521678ac 100644 --- a/LEGO1/mxsemaphore.h +++ b/LEGO1/mxsemaphore.h @@ -1,10 +1,6 @@ #ifndef MX_SEMAPHORE_H #define MX_SEMAPHORE_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include "mxtypes.h" #include diff --git a/LEGO1/mxtimer.h b/LEGO1/mxtimer.h index 78e1ca6d..357cf410 100644 --- a/LEGO1/mxtimer.h +++ b/LEGO1/mxtimer.h @@ -1,10 +1,6 @@ #ifndef MXTIMER_H #define MXTIMER_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include "mxcore.h" // VTABLE 0x100dc0e0 diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/mxvideoparamflags.h index 5ff02305..f25ab4bd 100644 --- a/LEGO1/mxvideoparamflags.h +++ b/LEGO1/mxvideoparamflags.h @@ -1,10 +1,6 @@ #ifndef MXVIDEOPARAMFLAGS_H #define MXVIDEOPARAMFLAGS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - #include // Must be union with struct for match.