diff -u -r php4.broken/Zend/CVS/Entries php4/Zend/CVS/Entries --- php4.broken/Zend/CVS/Entries Sat Sep 22 00:09:34 2001 +++ php4/Zend/CVS/Entries Fri Sep 21 23:48:52 2001 @@ -1,76 +1,76 @@ /.cvsignore/1.12/Sat Aug 4 21:09:19 2001// -/FlexLexer.h/1.4/Sat Sep 22 04:09:08 2001// -/LICENSE/1.5/Sat Sep 22 04:09:08 2001// -/Makefile.am/1.43/Sat Sep 22 04:09:08 2001// -/ZEND_CHANGES/1.6/Sat Sep 22 04:09:09 2001// -/Zend.dsp/1.19/Sat Sep 22 04:09:09 2001/-kb/ -/Zend.m4/1.27/Sat Sep 22 04:09:09 2001// -/ZendCore.dep/1.4/Sat Sep 22 04:09:09 2001// -/ZendTS.dsp/1.32/Sat Sep 22 04:09:10 2001/-kb/ -/acconfig.h/1.26/Sat Sep 22 04:09:10 2001// -/acinclude.m4/1.8/Sat Sep 22 04:09:10 2001// -/build.mk/1.2/Sat Sep 22 04:09:10 2001// -/buildconf/1.6/Sat Sep 22 04:09:10 2001// -/configure.in/1.31/Sat Sep 22 04:09:10 2001// -/flex.skl/1.26/Sat Sep 22 04:09:11 2001// -/zend.c/1.141/Sat Sep 22 04:09:12 2001// -/zend.h/1.140/Sat Sep 22 04:09:13 2001// -/zend.ico/1.1.1.1/Sat Sep 22 04:09:13 2001// -/zend_API.c/1.100/Sat Sep 22 04:09:14 2001// -/zend_API.h/1.107/Sat Sep 22 04:09:14 2001// -/zend_alloc.c/1.93/Sat Sep 22 04:09:15 2001// -/zend_alloc.h/1.31/Sat Sep 22 04:09:15 2001// -/zend_builtin_functions.c/1.103/Sat Sep 22 04:09:16 2001// -/zend_builtin_functions.h/1.7/Sat Sep 22 04:09:16 2001// -/zend_compile.c/1.218/Sat Sep 22 04:09:19 2001// -/zend_compile.h/1.135/Sat Sep 22 04:09:19 2001// -/zend_config.w32.h/1.22/Sat Sep 22 04:09:19 2001// -/zend_constants.c/1.34/Sat Sep 22 04:09:20 2001// -/zend_constants.h/1.19/Sat Sep 22 04:09:20 2001// -/zend_dynamic_array.c/1.6/Sat Sep 22 04:09:20 2001// -/zend_dynamic_array.h/1.6/Sat Sep 22 04:09:20 2001// -/zend_errors.h/1.9/Sat Sep 22 04:09:20 2001// -/zend_execute.c/1.285/Sat Sep 22 04:09:23 2001// -/zend_execute.h/1.40/Sat Sep 22 04:09:23 2001// -/zend_execute_API.c/1.137/Sat Sep 22 04:09:24 2001// -/zend_execute_locks.h/1.9/Sat Sep 22 04:09:24 2001// -/zend_extensions.c/1.37/Sat Sep 22 04:09:24 2001// -/zend_extensions.h/1.43/Sat Sep 22 04:09:24 2001// -/zend_fast_cache.h/1.12/Sat Sep 22 04:09:24 2001// -/zend_globals.h/1.78/Sat Sep 22 04:09:24 2001// -/zend_globals_macros.h/1.15/Sat Sep 22 04:09:24 2001// -/zend_hash.c/1.80/Sat Sep 22 04:09:25 2001// -/zend_hash.h/1.53/Sat Sep 22 04:09:26 2001// -/zend_highlight.c/1.24/Sat Sep 22 04:09:26 2001// -/zend_highlight.h/1.15/Sat Sep 22 04:09:26 2001// -/zend_indent.c/1.15/Sat Sep 22 04:09:26 2001// -/zend_indent.h/1.9/Sat Sep 22 04:09:26 2001// -/zend_ini.c/1.16/Sat Sep 22 04:09:27 2001// -/zend_ini.h/1.18/Sat Sep 22 04:09:27 2001// -/zend_ini_parser.y/1.14/Sat Sep 22 04:09:27 2001// -/zend_ini_scanner.h/1.10/Sat Sep 22 04:09:27 2001// -/zend_ini_scanner.l/1.20/Sat Sep 22 04:09:27 2001// -/zend_istdiostream.h/1.2/Sat Sep 22 04:09:27 2001// -/zend_language_parser.y/1.14/Sat Sep 22 04:09:30 2001// -/zend_language_scanner.h/1.6/Sat Sep 22 04:09:30 2001// -/zend_language_scanner.l/1.40/Sat Sep 22 04:09:30 2001// -/zend_list.c/1.49/Sat Sep 22 04:09:30 2001// -/zend_list.h/1.37/Sat Sep 22 04:09:31 2001// -/zend_llist.c/1.30/Sat Sep 22 04:09:31 2001// -/zend_llist.h/1.23/Sat Sep 22 04:09:31 2001// -/zend_modules.h/1.40/Sat Sep 22 04:09:31 2001// -/zend_opcode.c/1.54/Sat Sep 22 04:09:31 2001// -/zend_operators.c/1.115/Sat Sep 22 04:09:33 2001// -/zend_operators.h/1.48/Sat Sep 22 04:09:33 2001// -/zend_ptr_stack.c/1.15/Sat Sep 22 04:09:33 2001// -/zend_ptr_stack.h/1.12/Sat Sep 22 04:09:33 2001// -/zend_qsort.c/1.1/Sat Sep 22 04:09:33 2001// -/zend_qsort.h/1.1/Sat Sep 22 04:09:33 2001// -/zend_sprintf.c/1.9/Sat Sep 22 04:09:34 2001// -/zend_stack.c/1.9/Sat Sep 22 04:09:34 2001// -/zend_stack.h/1.11/Sat Sep 22 04:09:34 2001// -/zend_static_allocator.c/1.4/Sat Sep 22 04:09:34 2001// -/zend_static_allocator.h/1.6/Sat Sep 22 04:09:34 2001// -/zend_variables.c/1.39/Sat Sep 22 04:09:34 2001// -/zend_variables.h/1.20/Sat Sep 22 04:09:34 2001// +/FlexLexer.h/1.4/Mon Jul 3 00:55:36 2000// +/LICENSE/1.5/Mon Feb 26 05:44:29 2001// +/Makefile.am/1.43/Wed Sep 19 08:26:11 2001// +/ZEND_CHANGES/1.6/Sun Nov 12 17:21:14 2000// +/Zend.dsp/1.19/Wed Sep 19 02:08:21 2001/-kb/ +/Zend.m4/1.27/Sun Aug 26 15:28:04 2001// +/ZendCore.dep/1.4/Mon Feb 26 18:18:34 2001// +/ZendTS.dsp/1.32/Wed Sep 19 08:26:38 2001/-kb/ +/acconfig.h/1.26/Sun Mar 11 19:35:25 2001// +/acinclude.m4/1.8/Sun Jun 18 16:51:41 2000// +/build.mk/1.2/Sun Oct 10 02:02:13 1999// +/buildconf/1.6/Mon Oct 4 15:20:12 1999// +/configure.in/1.31/Sat Dec 2 13:26:41 2000// +/flex.skl/1.26/Sat Sep 22 00:06:27 2001// +/zend.c/1.141/Sat Sep 22 00:06:27 2001// +/zend.h/1.140/Fri Sep 21 23:21:59 2001// +/zend.ico/1.1.1.1/Wed Apr 7 18:10:09 1999// +/zend_API.c/1.100/Fri Aug 24 03:18:44 2001// +/zend_API.h/1.107/Sun Aug 12 14:50:14 2001// +/zend_alloc.c/1.93/Fri Aug 17 11:33:45 2001// +/zend_alloc.h/1.31/Sat Aug 11 15:57:07 2001// +/zend_builtin_functions.c/1.103/Sat Aug 11 15:57:07 2001// +/zend_builtin_functions.h/1.7/Mon Jul 30 01:48:22 2001// +/zend_compile.c/1.218/Sun Sep 16 16:47:58 2001// +/zend_compile.h/1.135/Sun Sep 9 23:49:26 2001// +/zend_config.w32.h/1.22/Mon Feb 26 05:43:26 2001// +/zend_constants.c/1.34/Tue Aug 14 15:10:44 2001// +/zend_constants.h/1.19/Tue Aug 14 12:21:56 2001// +/zend_dynamic_array.c/1.6/Mon Feb 26 05:43:26 2001// +/zend_dynamic_array.h/1.6/Mon Feb 26 05:43:26 2001// +/zend_errors.h/1.9/Mon Feb 26 05:43:26 2001// +/zend_execute.c/1.285/Thu Aug 30 12:06:05 2001// +/zend_execute.h/1.40/Tue Jul 31 04:51:06 2001// +/zend_execute_API.c/1.137/Fri Aug 31 22:14:27 2001// +/zend_execute_locks.h/1.9/Fri Aug 31 19:32:25 2001// +/zend_extensions.c/1.37/Wed Aug 15 10:30:58 2001// +/zend_extensions.h/1.43/Tue Jul 31 04:51:06 2001// +/zend_fast_cache.h/1.12/Sat Jul 28 10:51:54 2001// +/zend_globals.h/1.78/Sat Sep 22 00:06:27 2001// +/zend_globals_macros.h/1.15/Mon Aug 6 13:48:51 2001// +/zend_hash.c/1.80/Mon Sep 17 21:00:07 2001// +/zend_hash.h/1.53/Mon Sep 17 21:00:07 2001// +/zend_highlight.c/1.24/Mon Aug 6 14:26:04 2001// +/zend_highlight.h/1.15/Mon Jul 30 07:43:02 2001// +/zend_indent.c/1.15/Mon Aug 6 23:56:32 2001// +/zend_indent.h/1.9/Mon Feb 26 05:43:26 2001// +/zend_ini.c/1.16/Mon Sep 17 21:00:07 2001// +/zend_ini.h/1.18/Sat Aug 11 15:57:07 2001// +/zend_ini_parser.y/1.14/Mon Aug 6 13:48:51 2001// +/zend_ini_scanner.h/1.10/Sun Sep 9 23:49:26 2001// +/zend_ini_scanner.l/1.20/Sat Sep 22 00:06:27 2001// +/zend_istdiostream.h/1.2/Fri Jan 12 11:14:46 2001// +/zend_language_parser.y/1.14/Sat Aug 11 15:57:07 2001// +/zend_language_scanner.h/1.6/Sun Sep 9 23:49:26 2001// +/zend_language_scanner.l/1.40/Sat Sep 22 00:06:27 2001// +/zend_list.c/1.49/Sat Aug 11 15:57:07 2001// +/zend_list.h/1.37/Thu Sep 20 15:51:04 2001// +/zend_llist.c/1.30/Tue Sep 18 05:49:18 2001// +/zend_llist.h/1.23/Mon Sep 17 21:00:07 2001// +/zend_modules.h/1.40/Sat Sep 1 12:57:50 2001// +/zend_opcode.c/1.54/Tue Jul 31 04:51:06 2001// +/zend_operators.c/1.115/Tue Sep 4 17:26:01 2001// +/zend_operators.h/1.48/Mon Aug 13 00:26:51 2001// +/zend_ptr_stack.c/1.15/Wed Jul 11 17:18:22 2001// +/zend_ptr_stack.h/1.12/Wed Jul 11 17:18:22 2001// +/zend_qsort.c/1.1/Mon Sep 17 21:00:07 2001// +/zend_qsort.h/1.1/Mon Sep 17 21:00:07 2001// +/zend_sprintf.c/1.9/Mon Feb 26 05:43:27 2001// +/zend_stack.c/1.9/Mon Feb 26 05:43:27 2001// +/zend_stack.h/1.11/Mon Feb 26 05:43:27 2001// +/zend_static_allocator.c/1.4/Mon Feb 26 05:43:27 2001// +/zend_static_allocator.h/1.6/Mon Feb 26 05:43:27 2001// +/zend_variables.c/1.39/Thu Aug 16 14:05:02 2001// +/zend_variables.h/1.20/Tue Aug 14 12:21:56 2001// D diff -u -r php4.broken/Zend/FlexLexer.h php4/Zend/FlexLexer.h --- php4.broken/Zend/FlexLexer.h Sat Sep 22 00:09:08 2001 +++ php4/Zend/FlexLexer.h Fri Sep 21 23:59:44 2001 @@ -49,7 +49,12 @@ extern "C++" { struct yy_buffer_state; + +#ifndef YY_STATE_DEFINED +#define YY_STATE_DEFINED typedef int yy_state_type; +#endif + class FlexLexer { public: Only in php4/Zend: Makefile.in Only in php4/Zend: zend_config.h diff -u -r php4.broken/Zend/zend_globals.h php4/Zend/zend_globals.h --- php4.broken/Zend/zend_globals.h Sat Sep 22 00:09:24 2001 +++ php4/Zend/zend_globals.h Sat Sep 22 00:00:26 2001 @@ -216,7 +216,10 @@ #endif }; +#ifndef YY_STATE_DEFINED +#define YY_STATE_DEFINED typedef int yy_state_type; +#endif struct _zend_scanner_globals { FILE *yy_in; Only in php4/Zend: zend_ini_parser.c Only in php4/Zend: zend_ini_parser.h Only in php4/Zend: zend_ini_parser.output Only in php4/Zend: zend_ini_scanner.c Only in php4/Zend: zend_language_parser.c Only in php4/Zend: zend_language_parser.h Only in php4/Zend: zend_language_parser.output Only in php4/Zend: zend_language_scanner.c