From: Stanislav Malyshev <stas@php.net>
Date: Sun, 19 Apr 2015 00:51:42 +0000 (-0700)
Subject: Merge remote-tracking branch 'github/pr/637' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d66cb721d41b4a0d18dfec612f8a19e1c9b4de75;p=php

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

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

d66cb721d41b4a0d18dfec612f8a19e1c9b4de75
diff --cc ext/json/json.dsp
index e5bb3767bf,e5bb3767bf..9ef97bb80e
--- a/ext/json/json.dsp
+++ b/ext/json/json.dsp
@@@ -102,22 -102,22 +102,6 @@@ SOURCE=.\JSON_parser.
  
  SOURCE=.\JSON_parser.h
  # End Source File
--# Begin Source File
--
--SOURCE=.\utf8_decode.c
--# End Source File
--# Begin Source File
--
--SOURCE=.\utf8_decode.h
--# End Source File
--# Begin Source File
--
--SOURCE=.\utf8_to_utf16.c
--# End Source File
--# Begin Source File
--
--SOURCE=.\utf8_to_utf16.h
--# End Source File
  # End Group
  # Begin Group "Header Files"
  
diff --cc ext/json/package.xml
index 0651de736f,0651de736f..b59e47cf0b
--- a/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" />