mirror of
https://github.com/php/php-src.git
synced 2024-09-23 02:47:26 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Properly fixed bug #63186 on NetBSD == 6.0
This commit is contained in:
commit
1dc7d0da08
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user