Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
gd: fix proto comment
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex

The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
Merge branch 'PHP-5.5'

* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment
allow use of gdImageCreateFromJpegEx with system libgd
gd: missing headers in previous
Merge branch 'PHP-5.5'

* PHP-5.5:
  gd: missing headers in previous
  allow use of gdImageCreateFromJpegEx with system libgd