Skip to content

Commit 3e86050

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Remove unused symbol definition Remove redundant memory.h file
2 parents f45a3a7 + f7cdac6 commit 3e86050

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

ext/mbstring/libmbfl/config.h.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#define HAVE_MEMORY_H 1
21
/* #undef HAVE_STRINGS_H */
32
/* #undef HAVE_STRCASECMP */
43
#define HAVE_STRICMP 1

ext/mbstring/libmbfl/mbfl/mbfl_allocators.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
#endif
3434

3535
#include <stdlib.h>
36-
37-
#ifdef HAVE_MEMORY_H
38-
#include <memory.h>
39-
#endif
40-
4136
#include <string.h>
4237
#include <stddef.h>
4338

win32/sendmail.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <string.h>
2727
#include <math.h>
2828
#include <malloc.h>
29-
#include <memory.h>
3029
#include <winbase.h>
3130
#include "sendmail.h"
3231
#include "php_ini.h"

0 commit comments

Comments
 (0)