diff options
| author | Matteo Beccati <mbeccati@php.net> | 2013-07-19 09:40:15 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2013-07-19 09:40:15 +0200 |
| commit | 85bbc8fa9dcfde80a1628ac5e05b22f14f76e222 (patch) | |
| tree | 92ad552bab8617e104523171110fb8f19846cb4b /main | |
| parent | 1673e8f67e1f6f4e8bc37d8090735577e476a149 (diff) | |
| parent | 1dc7d0da083ff77f02957ffdff9f4e8e7e3cf477 (diff) | |
| download | php-git-85bbc8fa9dcfde80a1628ac5e05b22f14f76e222.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Properly fixed bug #63186 on NetBSD == 6.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/cast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/cast.c b/main/streams/cast.c index da6a293e45..bf96d3cf80 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -33,7 +33,7 @@ #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */ -# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000) +# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000) # define PHP_FPOS_T off_t # else # define PHP_FPOS_T fpos_t |