Mercurial > hg > release > icedtea-web-1.4
changeset 732:7417aafce17f icedtea-web-1.4
Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Fri, 03 May 2013 21:17:01 +0200 |
| parents | a2b168188cbe |
| children | 35aa1ba34610 |
| files | ChangeLog plugin/icedteanp/IcedTeaNPPlugin.cc |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 02 19:53:33 2013 +0200 +++ b/ChangeLog Fri May 03 21:17:01 2013 +0200 @@ -1,3 +1,11 @@ +2013-05-03 Jiri Vanek <jvanek@redhat.com> + + Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch + * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) + return type set-up by dependency on defined LEGACY_XULRUNNERAPI. + This one is set by IT_CHECK_XULRUNNER_API_VERSION during configure. + if defined, then old char* is used. New const char* is used otherwise. + 2013-05-02 Jana Fabrikova <jfabriko@redhat.com> * tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html:
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu May 02 19:53:33 2013 +0200 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 03 21:17:01 2013 +0200 @@ -1995,7 +1995,11 @@ // Returns a string describing the MIME type that this plugin // handles. __attribute__ ((visibility ("default"))) -const char* +#ifdef LEGACY_XULRUNNERAPI + char* +#else + const char* +#endif NP_GetMIMEDescription () { PLUGIN_DEBUG ("NP_GetMIMEDescription\n");