diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-20 14:40:30 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-20 14:40:30 +0000 |
| commit | 6f297a370a25e07ff1c50ceefedb79b7bdbed73a (patch) | |
| tree | e45306abc9b0743fbbf8638f39472b7201fdf2d2 | |
| parent | 8084d278850b9b4cf4880ed75cf19f04c38b953f (diff) | |
| download | php-git-6f297a370a25e07ff1c50ceefedb79b7bdbed73a.tar.gz | |
Fix Windows build
| -rw-r--r-- | ext/session/session.c | 1 | ||||
| -rw-r--r-- | ext/standard/output.c | 2 | ||||
| -rw-r--r-- | main/internal_functions_win32.c | 1 | ||||
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | main/php.h | 2 | ||||
| -rw-r--r-- | win32/php4dllts.dsp | 16 |
6 files changed, 11 insertions, 13 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index f709b6be2b..31f6c92f5c 100644 --- 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 e6961f1114..e0d9331678 100644 --- 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 61c42a9ca1..46d6d2c8b3 100644 --- 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 e6961f1114..e0d9331678 100644 --- 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 f99d2c3007..9028452a43 100644 --- 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 80cb61b1f1..1f9bd9ca31 100644 --- a/win32/php4dllts.dsp +++ b/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
|