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

Zend/zend_language_scanner_defs.h

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

ext/fileinfo/libmagic/magic.c

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