Fix Windows build

diff --git a/ext/session/session.c b/ext/session/session.c
index f709b6be2bf449e022b404711ce2299a020d4466..31f6c92f5cad7cd371f54a01656c2fd7d723e482 100644 (file)
--- a/ext/session/session.c
+++ b/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"
 

diff --git a/ext/standard/output.c b/ext/standard/output.c
index e6961f1114205aec1b23bed55bd86a05b4f18ddb..e0d93316788641343b86ad79c1e3d4c8fd9e89b5 100644 (file)
--- a/ext/standard/output.c
+++ b/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 */

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 61c42a9ca15b26ad174c860c3869173ed52544ca..46d6d2c8b333fe29147b5162c304b01aac87a395 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/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"

diff --git a/main/output.c b/main/output.c
index e6961f1114205aec1b23bed55bd86a05b4f18ddb..e0d93316788641343b86ad79c1e3d4c8fd9e89b5 100644 (file)
--- a/main/output.c
+++ b/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 */

diff --git a/main/php.h b/main/php.h
index f99d2c3007b576d60f5410b9a0a980aa58c43302..9028452a431241843461402ec1eace450db0ab51 100644 (file)
--- a/main/php.h
+++ b/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))

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 80cb61b1f1794fa75b6c7dee300492a978925177..1f9bd9ca31eb40b7a21a94a06895e05f9e97b21f 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -178,6 +178,10 @@ SOURCE=..\main\network.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\output.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\main\php_content_types.c\r
 # End Source File\r
 # Begin Source File\r
@@ -298,6 +302,10 @@ SOURCE=..\main\php_open_temporary_file.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\php_output.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\main\php_regex.h\r
 # End Source File\r
 # Begin Source File\r
@@ -482,10 +490,6 @@ SOURCE=..\ext\session\mod_user.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\output.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\standard\pack.c\r
 # End Source File\r
 # Begin Source File\r
@@ -695,10 +699,6 @@ SOURCE=..\ext\odbc\php_odbc.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\php_output.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\ext\pcre\php_pcre.h\r
 # End Source File\r
 # Begin Source File\r