diff options
Diffstat (limited to 'ext/standard/flock_compat.c')
| -rw-r--r-- | ext/standard/flock_compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index d5d73f4c36..80d9f87972 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -52,7 +52,7 @@ PHPAPI int php_flock(int fd, int operation) flck.l_start = flck.l_len = 0; flck.l_whence = SEEK_SET; - + if (operation & LOCK_SH) flck.l_type = F_RDLCK; else if (operation & LOCK_EX) @@ -66,7 +66,7 @@ PHPAPI int php_flock(int fd, int operation) ret = fcntl(fd, operation & LOCK_NB ? F_SETLK : F_SETLKW, &flck); - if (operation & LOCK_NB && ret == -1 && + if (operation & LOCK_NB && ret == -1 && (errno == EACCES || errno == EAGAIN)) errno = EWOULDBLOCK; @@ -223,7 +223,7 @@ int inet_aton(const char *cp, struct in_addr *ap) ap->s_addr = htonl(addr); } - return 1; + return 1; } /* }}} */ #endif /* !HAVE_INET_ATON */ |