cvs: php4(PHP_4_3) /main main.c
| From: | Sascha Schumann | Date: | Tue, 06 May 2003 13:18:38 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20739@lists.php.net to get a copy of this message | ||
sas Tue May 6 09:18:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
Real fix for open() issue on Solaris
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.26 php4/main/main.c:1.512.2.27
--- php4/main/main.c:1.512.2.26 Tue May 6 09:06:53 2003
+++ php4/main/main.c Tue May 6 09:18:38 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.26 2003/05/06 13:06:53 sas Exp $ */
+/* $Id: main.c,v 1.512.2.27 2003/05/06 13:18:38 sas Exp $ */
/* {{{ includes
*/
@@ -64,9 +64,13 @@
#include "ext/standard/credits.h"
#ifdef PHP_WIN32
#include <io.h>
-#include <fcntl.h>
#include "win32/php_registry.h"
#endif
+
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
#include "php_syslog.h"
#if PHP_SIGCHILD
@@ -1551,12 +1555,6 @@
return 0;
}
/* }}} */
-
-#ifdef HAVE_BROKEN_GETCWD
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
-#endif
/* {{{ php_execute_script
*/