- Windows and UNIX compile fixes

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 50a0879c1abf4c0143739a803d4d17659a1b67a5..68d4edcde2d1d7902cec25c7cfc864aa88a23d98 100644 (file)
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
 #ifdef PHP_WIN32
 #include <windows.h>
 #include <winsock.h>
@@ -35,7 +36,6 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #endif
-#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -86,7 +86,9 @@ static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **open
        char *trailing_slash;
        FILE *fp;
        char *opened_path;
+#ifndef PHP_WIN32
        int fd;
+#endif
 
        if (!path) {
                return NULL;

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 35174c9140dcce41a75edeffd7acaa4f2dae92d7..d1008123b341d4c6f3063aac2893286fffebc202 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -292,6 +292,14 @@ SOURCE=..\main\SAPI.h
 SOURCE=..\main\win95nt.h\r
 # End Source File\r
 # End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\main\php_open_temporary_file.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\main\php_open_temporary_file.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "Function Modules"\r
 \r