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:
Matteo Beccati 2013-07-19 09:39:53 +02:00
commit 1dc7d0da08

View File

@ -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