merge revision(s) ed3d8f74ec2eee43d50f9826e2f11ceea279823e:

	Delete a macro that has never been used, probably added by mistake

	---
	 util.c | 7 -------
	 1 file changed, 7 deletions(-)

2 files changed, 1 insertions, 8 deletions

diff --git a/util.c b/util.c
index d2fa329a94..eb7de81b18 100644
--- a/util.c
+++ b/util.c
@@ -208,13 +208,6 @@ ruby_strtoul(const char *str, char **endptr, int base)
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
-#endif
-
-#ifndef S_ISDIR
-#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
 
 typedef int (cmpfunc_t)(const void*, const void*, void*);
 
diff --git a/version.h b/version.h
index 84ac0ec730..cdb2dcbb62 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 253
+#define RUBY_PATCHLEVEL 254
 
 #define RUBY_RELEASE_YEAR 2024
 #define RUBY_RELEASE_MONTH 5