diff options
| author | Matteo Beccati <mbeccati@php.net> | 2013-07-19 09:39:53 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2013-07-19 09:39:53 +0200 |
| commit | 1dc7d0da083ff77f02957ffdff9f4e8e7e3cf477 (patch) | |
| tree | 45e240b9c74ede9b4983d48d7165ddd3322047f5 /main/streams | |
| parent | 99afc6dc11016be47ce2ba09779ae4a34d435f5b (diff) | |
| parent | 2b9d42433f8e634593c2306d5d0ef61cc44281bf (diff) | |
| download | php-git-1dc7d0da083ff77f02957ffdff9f4e8e7e3cf477.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Properly fixed bug #63186 on NetBSD == 6.0
Diffstat (limited to 'main/streams')
| -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 |