Skip to content

Fix Windows #defines—don't define WINDOWS or _WINDOWS, use predefined _WIN32 everywhere #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 19, 2025
Merged

Fix Windows #defines—don't define WINDOWS or _WINDOWS, use predefined _WIN32 everywhere #224

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb56667
Use predefined _WIN32 everywhere instead of defining WINDOWS
garyo Nov 14, 2025
8aaf9d2
Remove WINDOWS preproc defs in vcproj & dsp project files
garyo Nov 14, 2025
42776e0
More Windows build fixes
garyo Nov 14, 2025
cb4a05e
Remove unneeded defs of WIN32 and WIN64 in project files
garyo Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Examples/Basic/Basic_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down Expand Up @@ -203,7 +203,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -282,7 +282,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/Custom/Custom_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
5 changes: 3 additions & 2 deletions Examples/Custom/custom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
crafted piece of image processing software.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down Expand Up @@ -71,7 +72,7 @@ parseCustomParam(char *str, double &x, double &y)
void
writeCustomParam(char *str, int strlen, double x, double y)
{
#ifdef WIN32
#ifdef _WIN32
_snprintf(str, strlen, "%lg %lg", x, y);
#else
snprintf(str, strlen, "%lg %lg", x, y);
Expand Down
4 changes: 2 additions & 2 deletions Examples/DepthConverter/DepthConverter_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/DrawSuite/DrawSuite_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/DrawSuite/drawsuite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
and so do nothing.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions Examples/Invert/Invert_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;INVERT_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/OpenGL/opengl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#if defined(WINDOWS)
#if defined(_WIN32)
#define NOMINMAX
#include <windows.h>
#endif
#include <GL/gl.h>
Expand Down
4 changes: 2 additions & 2 deletions Examples/Overlay/Overlay_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
3 changes: 2 additions & 1 deletion Examples/Overlay/overlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
and so do nothing.
*/

#ifdef WIN32
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions Examples/Rectangle/Rectangle_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions Examples/Test/Test_2005.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;TEST_2005_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -119,7 +119,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;TEST_2005_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
16 changes: 8 additions & 8 deletions HostSupport/HostSupport.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -107,7 +107,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -173,7 +173,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -238,7 +238,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -299,7 +299,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -363,7 +363,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -426,7 +426,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -488,7 +488,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down
8 changes: 4 additions & 4 deletions HostSupport/examples/CacheDemo.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -121,7 +121,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -197,7 +197,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -276,7 +276,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down
8 changes: 4 additions & 4 deletions HostSupport/examples/hostDemo.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -121,7 +121,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down Expand Up @@ -197,7 +197,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;COMPILED_FROM_DSP;XML_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
Expand Down Expand Up @@ -276,7 +276,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
PreprocessorDefinitions="WIN32;COMPILED_FROM_DSP;XML_STATIC"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Expand Down
5 changes: 3 additions & 2 deletions HostSupport/include/ofxhBinary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

#if defined(UNIX)
#include <dlfcn.h>
#elif defined (WINDOWS)
#elif defined (_WIN32)
#define NOMINMAX
#include "windows.h"
#include <assert.h>
#endif
Expand All @@ -44,7 +45,7 @@ namespace OFX
bool _invalid;
#if defined(UNIX)
void *_dlHandle;
#elif defined (WINDOWS)
#elif defined (_WIN32)
HINSTANCE _dlHandle;
#endif
time_t _time;
Expand Down
12 changes: 6 additions & 6 deletions HostSupport/include/ofxhPropertySuite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,18 +305,18 @@ namespace OFX {
// get multiple values
void getValueN(APIType *value, int count) const;

#ifdef WINDOWS
#pragma warning( disable : 4181 )
#endif
#ifdef _WIN32
#pragma warning( disable : 4181 )
#endif
/// get one value
const ReturnType getValue(int index=0) const;

/// get one value, without going through the getHook
const ReturnType getValueRaw(int index=0) const;

#ifdef WINDOWS
#pragma warning( default : 4181 )
#endif
#ifdef _WIN32
#pragma warning( default : 4181 )
#endif
// get multiple values, without going through the getHook
void getValueNRaw(APIType *value, int count) const;

Expand Down
Loading
Loading