From a9b6a7bf7204cd1244da7e05fafea721cf3b2e4f Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Wed, 29 May 2024 17:11:36 -0700
Subject: merge revision(s) ce20367a0e2f1fcfabebf3b6bea732fc71fa79f7: [Backport
 #20500]

	Define `incflags` also on mswin
---
 version.h          | 2 +-
 win32/Makefile.sub | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/version.h b/version.h
index 607fa63527..e9435c980c 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 77
+#define RUBY_PATCHLEVEL 78
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3d4bbc87e8..93bc1e6458 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -158,6 +158,9 @@ OPTFLAGS = -O2b2xg-
 OPTFLAGS = -O2sy-
 !endif
 !endif
+!if !defined(incflags)
+incflags =
+!endif
 !if !defined(PLATFORM)
 PLATFORM = mswin32
 !endif
@@ -967,6 +970,7 @@ s,@WERRORFLAG@,$(WERRORFLAG),;t t
 s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
+s,@incflags@,$(incflags),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,$(LDFLAGS),;t t
 s,@LIBS@,user32.lib,;t t
-- 
cgit v1.2.3