com php-src: portable off_t: ext/fileinfo/libmagic/appren tice.c
| From: | Anatol Belski | Date: | Sun, 08 Mar 2015 18:47:24 +0000 |
| Subject: | com php-src: portable off_t: ext/fileinfo/libmagic/appren tice.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85348@lists.php.net to get a copy of this message | ||
Commit: ec84d36c9f2c349a056f4cc2866917ca50d4df34
Author: Anatol Belski <ab@php.net> Fri, 6 Mar 2015 11:19:28 +0100
Parents: 969ce2e877b807678d24dbfea8c56d17ca78e946
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec84d36c9f2c349a056f4cc2866917ca50d4df34
Log:
portable off_t
Changed paths:
M ext/fileinfo/libmagic/apprentice.c
Diff:
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 5e843fa..d87d904 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -2196,7 +2196,7 @@ goodchar(unsigned char x, const char *extra)
private int
parse_extra(struct magic_set *ms, struct magic_entry *me, const char *line,
- off_t off, size_t len, const char *name, const char *extra, int nt)
+ zend_off_t off, size_t len, const char *name, const char *extra, int nt)
{
size_t i;
const char *l = line;
@@ -2265,7 +2265,7 @@ parse_mime(struct magic_set *ms, struct magic_entry *me, const char *line)
struct magic *m = &me->mp[0];
return parse_extra(ms, me, line,
- CAST(off_t, offsetof(struct magic, mimetype)),
+ CAST(zend_off_t, offsetof(struct magic, mimetype)),
sizeof(m->mimetype), "MIME", "+-/.", 1);
}