com php-src: Merge remote-tracking branch 'github/pr/637' into PHP-5.6: ext/json/json.dsp ext/json/package.xml

From: Date: Sun, 19 Apr 2015 00:56:33 +0000
Subject: com php-src: Merge remote-tracking branch 'github/pr/637' into PHP-5.6: ext/json/json.dsp ext/json/package.xml
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86378@lists.php.net to get a copy of this message
Commit: d66cb721d41b4a0d18dfec612f8a19e1c9b4de75 Author: Stanislav Malyshev <stas@php.net> Sat, 18 Apr 2015 17:51:42 -0700 Parents: 1302eb7f7275c3f0b2b3af964dde91c44b769bbc 7e43b4f908711b4ad9708ed3460ef5a2d1776a22 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d66cb721d41b4a0d18dfec612f8a19e1c9b4de75 Log: Merge remote-tracking branch 'github/pr/637' into PHP-5.6 * github/pr/637: Remove unused code from ext/json. Changed paths: MM ext/json/json.dsp MM ext/json/package.xml Diff: diff --cc ext/json/json.dsp index e5bb376,e5bb376..9ef97bb --- 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 0651de7,0651de7..b59e47c --- 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" />

« previous php.cvs (#86378) next »