Fix Windows build

ext/session/session.c

@@ -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"
 

ext/standard/output.c

@@ -22,7 +22,7 @@
 #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 */

main/internal_functions_win32.c

@@ -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"

main/output.c

@@ -22,7 +22,7 @@
 #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 */

main/php.h

@@ -279,7 +279,7 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 
 
 /* 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))

win32/php4dllts.dsp

@@ -178,6 +178,10 @@ SOURCE=..\main\network.c
 # 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 @@ SOURCE=..\main\php_open_temporary_file.h
 # 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 @@ SOURCE=..\ext\session\mod_user.c
 # 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
@@ -695,10 +699,6 @@ SOURCE=..\ext\odbc\php_odbc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\ext\standard\php_output.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\ext\pcre\php_pcre.h
 # End Source File
 # Begin Source File