diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-23 19:22:10 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-23 19:22:10 +0000 |
| commit | 2620304003d8e004ac3fc93d8293b5b575514f44 (patch) | |
| tree | 5d61491d9769d05a2efa93c2e2e68bcba547a94a /ext/standard/flock_compat.c | |
| parent | 847284086bddcd5fd31eaa4869ec0d521dfd7289 (diff) | |
| download | php-git-2620304003d8e004ac3fc93d8293b5b575514f44.tar.gz | |
- MFH:
- drop bindlib usage on windows
- inet_pton, inet_ntop and inet_aton are always available (VC9 uses the CRT implementation, VC6 our own)
Diffstat (limited to 'ext/standard/flock_compat.c')
| -rw-r--r-- | ext/standard/flock_compat.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index 9bbb507d79..d561945533 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -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: |