Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Properly fixed bug #63186 on NetBSD == 6.0
13 years ago · 1dc7d0da08
1 changed files with 1 additions and 1 deletions
--- 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