diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-02-24 10:21:25 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-07 18:32:54 +0200 |
| commit | e06836a1a345d0f6975036dc6c0cf7596aa07031 (patch) | |
| tree | 3e46afae0d1303c0e568875bd661c6d6480f43a3 /win32 | |
| parent | 5f8915786f9fc3ec1af1089c9848f65a8d1541f5 (diff) | |
| download | php-git-e06836a1a345d0f6975036dc6c0cf7596aa07031.tar.gz | |
Remove checks for locale.h, setlocale, localeconv
The `<loccale.h>` header file, setlocale, and localeconv are part of the
standard C89 [1] and on current systems can be used unconditionally.
Since PHP 7.4 requires at least C89 or greater, the `HAVE_LOCALE_H`,
`HAVE_SETLOCALE`, and `HAVE_LOCALECONV` symbols defined by Autoconf in
configure.ac [2] can be ommitted and simplifed.
The bundled libmagic (file) has also been patched already in version
5.35 and up in upstream location so when it will be patched also in
php-src the check for locale.h header is still left in the configure.ac
and in windows headers definition file.
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.4
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Omit the bundled libmagic files
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32.h.in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 938af691a2..06632b0e20 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -76,8 +76,6 @@ #define HAVE_MEMMOVE 1 #define HAVE_PUTENV 1 #define HAVE_REGCOMP 1 -#define HAVE_SETLOCALE 1 -#define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 #ifndef HAVE_LIBBIND # define HAVE_SETVBUF 1 |