Skip to content

Commit 1dc7d0d

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Properly fixed bug #63186 on NetBSD == 6.0
2 parents 99afc6d + 2b9d424 commit 1dc7d0d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

main/streams/cast.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
3434

3535
/* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */
36-
# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000)
36+
# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
3737
# define PHP_FPOS_T off_t
3838
# else
3939
# define PHP_FPOS_T fpos_t

0 commit comments

Comments
 (0)