clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix bug #61504, fix build errors on windows and possibly other

Browse Source
This commit is contained in:
Pierre Joye 2012-03-28 01:59:41 +02:00
parent c8ced8c0a3
commit 74ee335e3a
3 changed files with 7432 additions and 7430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14830
Zend/zend_language_scanner.c
View File

File diff suppressed because it is too large Load Diff

30
Zend/zend_language_scanner_defs.h
View File

@ -1,15 +1,15 @@
/* Generated by re2c 0.13.5 on Wed Feb 15 17:38:31 2012 */ /* Generated by re2c 0.13.5 on Wed Mar 28 01:54:21 2012 */
#line 3 "Zend/zend_language_scanner_defs.h" #line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE { enum YYCONDTYPE {
yycST_IN_SCRIPTING, yycST_IN_SCRIPTING,
yycST_LOOKING_FOR_PROPERTY, yycST_LOOKING_FOR_PROPERTY,
yycST_BACKQUOTE, yycST_BACKQUOTE,
yycST_DOUBLE_QUOTES, yycST_DOUBLE_QUOTES,
yycST_HEREDOC, yycST_HEREDOC,
yycST_LOOKING_FOR_VARNAME, yycST_LOOKING_FOR_VARNAME,
yycST_VAR_OFFSET, yycST_VAR_OFFSET,
yycINITIAL, yycINITIAL,
yycST_END_HEREDOC, yycST_END_HEREDOC,
yycST_NOWDOC, yycST_NOWDOC,
}; };

2
ext/fileinfo/libmagic/magic.c
View File

@ -92,6 +92,7 @@ private const char *file_or_stream(struct magic_set *, const char *, php_stream
#endif #endif
/* XXX this functionality is excluded in php, enable it in apprentice.c:340 */ /* XXX this functionality is excluded in php, enable it in apprentice.c:340 */
#if 0
private const char * private const char *
get_default_magic(void) get_default_magic(void)
{ {
@ -215,6 +216,7 @@ magic_getpath(const char *magicfile, int action)
return action == FILE_LOAD ? get_default_magic() : MAGIC; return action == FILE_LOAD ? get_default_magic() : MAGIC;
} }
#endif
public struct magic_set * public struct magic_set *
magic_open(int flags) magic_open(int flags)