build: deal with non-const return values of NPP_GetMIMEDescription()

Deal with const and non-const return value of NPP_GetMIMEDescription().

Although it is hard to find evidences of how this value is used, I
think the non-const value could return a static string. But I prefer
being on the safe side and return a strdup() to the risk of leaking
that string on older versions.

Fixes the build on RHEL6 with xulrunner-1.9.2.24-2.el6.

2 files changed, 14 insertions, 0 deletions

diff --git a/SpiceXPI/src/plugin/np_entry.cpp b/SpiceXPI/src/plugin/np_entry.cpp
index 021694c..4eba645 100644
--- a/SpiceXPI/src/plugin/np_entry.cpp
+++ b/SpiceXPI/src/plugin/np_entry.cpp
@@ -209,10 +209,17 @@ NPError NP_Initialize(NPNetscapeFuncs *aNPNFuncs, NPPluginFuncs *aNPPFuncs)
     return NS_PluginInitialize();
 }
 
+#ifdef NPAPI_USE_CONSTCHARS
 const char *NP_GetMIMEDescription()
 {
     return NPP_GetMIMEDescription();
 }
+#else
+char *NP_GetMIMEDescription()
+{
+    return NPP_GetMIMEDescription();
+}
+#endif
 
 NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
 {
diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
index 2dada12..816ac63 100644
--- a/SpiceXPI/src/plugin/plugin.cpp
+++ b/SpiceXPI/src/plugin/plugin.cpp
@@ -106,10 +106,17 @@ namespace {
     }
 }
 
+#ifdef NPAPI_USE_CONSTCHARS
 const char *NPP_GetMIMEDescription(void)
 {
     return const_cast<char *>(MIME_TYPES_DESCRIPTION.c_str());
 }
+#else
+char *NPP_GetMIMEDescription(void)
+{
+    return strdup(MIME_TYPES_DESCRIPTION.c_str());
+}
+#endif
 
 //////////////////////////////////////
 //