fix incompatible types
Fixed referenced value separation
Switch use of strtok() to gd_strtok_r()

strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
Merge branch 'PHP-5.6'

* PHP-5.6:
  Switch use of strtok() to gd_strtok_r()
Merge remote-tracking branch 'php/master'