Commit 4139422
authored
fileinfo: Don't compile libmagic/strcasestr.c (GH-21522)
* ext/fileinfo/libmagic/file.h: delete HAVE_STRCASESTR ifdef
PHP's copy of libmagic doesn't use the strcasestr() function,
so there is no reason to prototype it, regardless of whether
or not the OS (libc) provides it.
* ext/fileinfo/libmagic.patch: update
Run ext/fileinfo/generate_patch.sh to re-roll this patch, a recent
commit removes HAVE_STRCASESTR from PHP's copy of libmagic.
* ext/fileinfo/config.{m4,w32}: don't compile strcasestr.c
Unlike the upstream library, PHP's copy of libmagic doesn't use the
strcasestr() function, so there is no reason to include strcasestr.c
in the list of source files.1 parent 4bfa1b6 commit 4139422
File tree
4 files changed
+14
-13
lines changed- ext/fileinfo
- libmagic
4 files changed
+14
-13
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | 32 | | |
38 | 33 | | |
39 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1727 | 1727 | | |
1728 | 1728 | | |
1729 | 1729 | | |
1730 | | - | |
| 1730 | + | |
1731 | 1731 | | |
1732 | 1732 | | |
1733 | 1733 | | |
| |||
1883 | 1883 | | |
1884 | 1884 | | |
1885 | 1885 | | |
1886 | | - | |
| 1886 | + | |
1887 | 1887 | | |
1888 | 1888 | | |
1889 | 1889 | | |
| |||
1903 | 1903 | | |
1904 | 1904 | | |
1905 | 1905 | | |
1906 | | - | |
| 1906 | + | |
| 1907 | + | |
| 1908 | + | |
| 1909 | + | |
| 1910 | + | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
| 1914 | + | |
| 1915 | + | |
1907 | 1916 | | |
1908 | 1917 | | |
1909 | 1918 | | |
| |||
3066 | 3075 | | |
3067 | 3076 | | |
3068 | 3077 | | |
3069 | | - | |
| 3078 | + | |
3070 | 3079 | | |
3071 | 3080 | | |
3072 | 3081 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
635 | 635 | | |
636 | 636 | | |
637 | 637 | | |
638 | | - | |
639 | | - | |
640 | | - | |
641 | 638 | | |
642 | 639 | | |
643 | 640 | | |
| |||
0 commit comments