Merge remote-tracking branch 'github/pr/637' into PHP-5.6

* github/pr/637:
  Remove unused code from ext/json.

diff --cc ext/json/json.dsp
index e5bb3767bf98327bc206c8cbab28d994223313e0,e5bb3767bf98327bc206c8cbab28d994223313e0..9ef97bb80e2c94575340527023eb81a695fcdbfe
--- 1/ext/json/json.dsp
--- 2/ext/json/json.dsp
+++ b/ext/json/json.dsp
@@@ -102,22 -102,22 +102,6 @@@ SOURCE=.\JSON_parser.
  \r
  SOURCE=.\JSON_parser.h\r
  # End Source File\r
--# Begin Source File\r
--\r
--SOURCE=.\utf8_decode.c\r
--# End Source File\r
--# Begin Source File\r
--\r
--SOURCE=.\utf8_decode.h\r
--# End Source File\r
--# Begin Source File\r
--\r
--SOURCE=.\utf8_to_utf16.c\r
--# End Source File\r
--# Begin Source File\r
--\r
--SOURCE=.\utf8_to_utf16.h\r
--# End Source File\r
  # End Group\r
  # Begin Group "Header Files"\r
  \r

diff --cc ext/json/package.xml
index 0651de736fc1b1e9ab55e8864f9e0f5daf1df564,0651de736fc1b1e9ab55e8864f9e0f5daf1df564..b59e47cf0bdc4de4755b84fd1d3dd002dff452a6
--- 1/ext/json/package.xml
--- 2/ext/json/package.xml
+++ b/ext/json/package.xml
@@@ -36,10 -36,10 +36,6 @@@
      <file role="src" name="JSON_parser.c" />
      <file role="src" name="JSON_parser.h" />
      <file role="src" name="php_json.h" />
--    <file role="src" name="utf8_decode.c" />
--    <file role="src" name="utf8_decode.h" />
--    <file role="src" name="utf8_to_utf16.c" />
--    <file role="src" name="utf8_to_utf16.h" />
      <dir role="test" name="tests">
        <file role="test" name="fail001.phpt" />
        <file role="test" name="pass001.phpt" />