Merge branch 'phpng' of git.php.net:php-src into phpng

# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed wrong comparisons
used only in the #ifdef 0