Real fix for open() issue on Solaris

diff --git a/main/main.c b/main/main.c
index 3219b19dedb84533d943aab273f3fa52385cfd26..081806dde87e76cb5862422d46492461c489574c 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -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
@@ -1552,12 +1556,6 @@ PHPAPI int php_handle_special_queries(TSRMLS_D)
 }
 /* }}} */
 
-#ifdef HAVE_BROKEN_GETCWD
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-#endif
-
 /* {{{ php_execute_script
  */
 PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)