Skip to content

Commit 956708a

Browse files
committed
Merge branch 'PHP-7.3'
* PHP-7.3: Declare function proto in header Declare function proto in header
2 parents 34e65f7 + 29dcf19 commit 956708a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ext/fileinfo/libmagic/file.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,9 @@ protected void buffer_init(struct buffer *, int, const void *, size_t);
502502
protected void buffer_fini(struct buffer *);
503503
protected int buffer_fill(const struct buffer *);
504504

505+
public void
506+
convert_libmagic_pattern(zval *pattern, char *val, size_t len, uint32_t options);
507+
505508
typedef struct {
506509
char *buf;
507510
uint32_t offset;

ext/fileinfo/libmagic/funcs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.94 2017/11/02 20:25:39 christos Exp $")
5656
# define PREG_OFFSET_CAPTURE (1<<8)
5757
#endif
5858

59-
extern public void convert_libmagic_pattern(zval *pattern, char *val, size_t len, uint32_t options);
60-
6159
protected int
6260
file_printf(struct magic_set *ms, const char *fmt, ...)
6361
{

0 commit comments

Comments
 (0)