cvs: php4 /ext/session session.c /main internal_functions_win32.c output.c php.h /win32 php4dllts.dsp

zeev Fri Jul 20 10:40:31 2001 EDT Modified files: /php4/ext/session session.c /php4/main internal_functions_win32.c output.c php.h /php4/win32 php4dllts.dsp Log: Fix Windows build Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.219 php4/ext/session/session.c:1.220 --- php4/ext/session/session.c:1.219 Wed Jul 18 18:56:56 2001 +++ php4/ext/session/session.c Fri Jul 20 10:40:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.219 2001/07/18 22:56:56 sas Exp $ */ +/* $Id: session.c,v 1.220 2001/07/20 14:40:30 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,7 +42,6 @@ #include "ext/standard/datetime.h" #include "ext/standard/php_lcg.h" #include "ext/standard/url_scanner_ex.h" -#include "ext/standard/php_output.h" #include "ext/standard/php_rand.h" /* for RAND_MAX */ #include "ext/standard/info.h" Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.41 php4/main/internal_functions_win32.c:1.42 --- php4/main/internal_functions_win32.c:1.41 Wed Jun 6 09:05:53 2001 +++ php4/main/internal_functions_win32.c Fri Jul 20 10:40:30 2001 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.41 2001/06/06 13:05:53 rasmus Exp $ */ +/* $Id: internal_functions_win32.c,v 1.42 2001/07/20 14:40:30 zeev Exp $ */ /* {{{ includes */ @@ -47,7 +47,6 @@ #include "ext/standard/php_ext_syslog.h" #include "ext/standard/php_standard.h" #include "ext/standard/php_lcg.h" -#include "ext/standard/php_output.h" #include "ext/standard/php_array.h" #include "ext/standard/php_assert.h" #include "ext/calendar/php_calendar.h" Index: php4/main/output.c diff -u php4/main/output.c:1.64 php4/main/output.c:1.65 --- php4/main/output.c:1.64 Fri Jul 20 09:59:00 2001 +++ php4/main/output.c Fri Jul 20 10:40:30 2001 @@ -17,12 +17,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.64 2001/07/20 13:59:00 zeev Exp $ */ +/* $Id: output.c,v 1.65 2001/07/20 14:40:30 zeev Exp $ */ #include "php.h" #include "ext/standard/head.h" #include "ext/session/php_session.h" -#include "basic_functions.h" +#include "ext/standard/basic_functions.h" #include "SAPI.h" /* output functions */ Index: php4/main/php.h diff -u php4/main/php.h:1.142 php4/main/php.h:1.143 --- php4/main/php.h:1.142 Wed Jun 6 09:05:53 2001 +++ php4/main/php.h Fri Jul 20 10:40:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.142 2001/06/06 13:05:53 rasmus Exp $ */ +/* $Id: php.h,v 1.143 2001/07/20 14:40:30 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -279,7 +279,7 @@ /* Output support */ -#include "ext/standard/php_output.h" +#include "main/php_output.h" #define PHPWRITE(str, str_len) php_body_write((str), (str_len)) #define PUTS(str) php_body_write((str), strlen((str))) #define PUTC(c) (php_body_write(&(c), 1), (c)) Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.41 php4/win32/php4dllts.dsp:1.42 --- php4/win32/php4dllts.dsp:1.41 Sun Jun 24 17:08:30 2001 +++ php4/win32/php4dllts.dsp Fri Jul 20 10:40:30 2001 @@ -178,6 +178,10 @@ # End Source File # Begin Source File +SOURCE=..\main\output.c +# End Source File +# Begin Source File + SOURCE=..\main\php_content_types.c # End Source File # Begin Source File @@ -298,6 +302,10 @@ # End Source File # Begin Source File +SOURCE=..\main\php_output.h +# End Source File +# Begin Source File + SOURCE=..\main\php_regex.h # End Source File # Begin Source File @@ -482,10 +490,6 @@ # End Source File # Begin Source File -SOURCE=..\ext\standard\output.c -# End Source File -# Begin Source File - SOURCE=..\ext\standard\pack.c # End Source File # Begin Source File @@ -692,10 +696,6 @@ # Begin Source File SOURCE=..\ext\odbc\php_odbc.h -# End Source File -# Begin Source File - -SOURCE=..\ext\standard\php_output.h # End Source File # Begin Source File