cvs: php4 /main php_open_temporary_file.c /win32 php4dllts.dsp
| From: | Andi Gutmans | Date: | Mon, 11 Sep 2000 19:14:42 +0000 |
| Subject: | cvs: php4 /main php_open_temporary_file.c /win32 php4dllts.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1715@lists.php.net to get a copy of this message | ||
andi Mon Sep 11 12:14:42 2000 EDT
Modified files:
/php4/main php_open_temporary_file.c
/php4/win32 php4dllts.dsp
Log:
- Windows and UNIX compile fixes
Index: php4/main/php_open_temporary_file.c
diff -u php4/main/php_open_temporary_file.c:1.2 php4/main/php_open_temporary_file.c:1.3
--- php4/main/php_open_temporary_file.c:1.2 Mon Sep 11 12:11:03 2000
+++ php4/main/php_open_temporary_file.c Mon Sep 11 12:14:41 2000
@@ -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 @@
char *trailing_slash;
FILE *fp;
char *opened_path;
+#ifndef PHP_WIN32
int fd;
+#endif
if (!path) {
return NULL;
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.13 php4/win32/php4dllts.dsp:1.14
--- php4/win32/php4dllts.dsp:1.13 Tue Sep 5 12:06:29 2000
+++ php4/win32/php4dllts.dsp Mon Sep 11 12:14:42 2000
@@ -292,6 +292,14 @@
SOURCE=..\main\win95nt.h
# End Source File
# End Group
+# Begin Source File
+
+SOURCE=..\main\php_open_temporary_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\main\php_open_temporary_file.h
+# End Source File
# End Group
# Begin Group "Function Modules"