From 75e7234f70823a2eec52540eb45b9b19239f79cf Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Tue, 10 Dec 2024 20:34:04 +0100 Subject: [PATCH] Drop redundant macro definitions from mbfl_defs.h These are defined by the standard include headers we already use. These cause conflicts which cause compiler warnings on some toolchains (see GH-17112). Closes GH-17114. --- ext/mbstring/libmbfl/mbfl/mbfl_defs.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h index 297b122bdd7..a51bee81113 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h @@ -31,18 +31,6 @@ #ifndef MBFL_DEFS_H #define MBFL_DEFS_H -#ifndef NULL -#ifdef __cplusplus -#define NULL (0L) -#else -#define NULL (void *)(0L) -#endif -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX ((size_t)~0) -#endif - #ifdef _WIN32 #ifdef MBFL_DLL_EXPORT #define MBFLAPI __declspec(dllexport)