From e793d8be8e1639e87648e91591bb103bb4b81868 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 24 Nov 2021 14:23:57 +0100 Subject: [PATCH] Use the standard _WIN32 instead of the custom MSWIN32 in libgd We're already checking `_WIN32` elsewhere in our bundled libgd, so it makes no sense to also have a custom `MSWIN32`. --- ext/gd/config.w32 | 1 - ext/gd/libgd/gdft.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 96c43dd90e583..e4be16cb406b4 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -88,7 +88,6 @@ if (PHP_GD != "no") { /D HAVE_COLORCLOSESTHWB \ /D HAVE_GD_GET_INTERPOLATION \ /D USE_GD_IOCTX \ -/D MSWIN32 \ "); if (ICC_TOOLSET) { ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index b23b7563b4c25..554a656e625c9 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -12,7 +12,7 @@ #include "gd.h" #include "gdhelpers.h" -#ifndef MSWIN32 +#ifndef _WIN32 #include #else #include