diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 19:39:21 -0400 |
| commit | 6821b67124604da690c5e9276d5370d679c63ac8 (patch) | |
| tree | befb4ca2520eb577950cef6cb76d10b914cbf67a /ext/standard/flock_compat.c | |
| parent | cd0b49c72aee33b3e44a9c589fcd93b9e1c7a64f (diff) | |
| download | php-6821b67124604da690c5e9276d5370d679c63ac8.tar.gz | |
Imported Upstream version 5.3.0RC1upstream/5.3.0_RC1upstream/5.3.0RC1
Diffstat (limited to 'ext/standard/flock_compat.c')
| -rw-r--r-- | ext/standard/flock_compat.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index 06009243a..908956633 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: flock_compat.c,v 1.29.2.1.2.3 2008/12/31 11:17:45 sebastian Exp $ */ +/* $Id: flock_compat.c,v 1.29.2.1.2.1.2.3 2008/12/31 11:15:45 sebastian Exp $ */ #include "php.h" #include <errno.h> @@ -30,6 +30,7 @@ #ifdef PHP_WIN32 #include <io.h> +#include "config.w32.h" #endif #ifdef NETWARE @@ -44,7 +45,7 @@ PHPAPI int flock(int fd, int operation) #endif /* !defined(HAVE_FLOCK) */ PHPAPI int php_flock(int fd, int operation) -#if HAVE_STRUCT_FLOCK +#if HAVE_STRUCT_FLOCK /* {{{ */ { struct flock flck; int ret; @@ -73,7 +74,8 @@ PHPAPI int php_flock(int fd, int operation) return ret; } -#elif defined(PHP_WIN32) +/* }}} */ +#elif defined(PHP_WIN32) /* {{{ */ /* * Program: Unix compatibility routines * @@ -152,6 +154,7 @@ PHPAPI int php_flock(int fd, int operation) #endif return -1; } +/* }}} */ #else #warning no proper flock support for your site { @@ -160,6 +163,7 @@ PHPAPI int php_flock(int fd, int operation) } #endif +#ifndef PHP_WIN32 #if !(HAVE_INET_ATON) /* {{{ inet_aton * Check whether "cp" is a valid ascii representation @@ -223,6 +227,7 @@ int inet_aton(const char *cp, struct in_addr *ap) } /* }}} */ #endif /* !HAVE_INET_ATON */ +#endif /* * Local variables: |