From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 11 May 2019 00:31:01 +0000 (+0200)
Subject: Remove redundant memory.h file
X-Git-Tag: php-7.4.0alpha1~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9219e56063433c752397b09407c809e04ff2cc7c;p=php

Remove redundant memory.h file

The memory.h file is part of the pre-C89 era and is on today's systems
only a simple wrapper for including the final string.h header file.
---

diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
index da563cc7d6..42130e8b2c 100644
--- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
@@ -33,11 +33,6 @@
 #endif
 
 #include <stdlib.h>
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-
 #include <string.h>
 #include <stddef.h>
 
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 6a685ee477..00063931ea 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <math.h>
 #include <malloc.h>
-#include <memory.h>
 #include <winbase.h>
 #include "sendmail.h"
 #include "php_ini.h"