Menu
▾
▴
SF.net SVN: openvrml:[4248] branches/0.18
|
From: <br...@us...> - 2012-04-23 06:48:09
|
Revision: 4248
http://openvrml.svn.sourceforge.net/openvrml/?rev=4248&view=rev
Author: braden
Date: 2012-04-23 06:47:59 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
NP[P]_GetMIMEDescription returns const char * in recent variations of NPAPI.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/configure.ac
branches/0.18/src/mozilla-plugin/openvrml.cpp
Property Changed:
----------------
branches/0.18/
branches/0.18/src/mozilla-plugin/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-23 06:19:36 UTC (rev 4247)
+++ branches/0.18/ChangeLog 2012-04-23 06:47:59 UTC (rev 4248)
@@ -1,3 +1,11 @@
+2012-04-23 Braden McDaniel <br...@en...>
+
+ NP[P]_GetMIMEDescription returns const char * in recent variations of
+ NPAPI.
+
+ * configure.ac
+ * src/mozilla-plugin/openvrml.cpp
+
2011-08-20 Braden McDaniel <br...@en...>
Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost
Modified: branches/0.18/configure.ac
===================================================================
--- branches/0.18/configure.ac 2012-04-23 06:19:36 UTC (rev 4247)
+++ branches/0.18/configure.ac 2012-04-23 06:47:59 UTC (rev 4248)
@@ -306,13 +306,27 @@
[have_gnomeui=no])
PKG_CHECK_MODULES([GIO], [gio-2.0], , [have_gio=no])
PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no])
-#
-# The Mozilla plug-in uses the npfunctions.h header introduced in
-# XULRunner 1.9.1.
-#
-PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 1.9.1],
+PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin >= 2],
[have_mozilla_plugin=yes],
[have_mozilla_plugin=no])
+AC_LANG_PUSH([C++])
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$MOZILLA_PLUGIN_CFLAGS $CPPFLAGS"
+AC_CACHE_CHECK([if NP_GetMIMEDescription returns const char *],
+ [ov_cv_np_getmimedescription_const_char],
+[ov_cv_np_getmimedescription_const_char=yes
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <npfunctions.h>
+char * NP_GetMIMEDescription() { return 0; }]],
+ [])],
+ [ov_cv_np_getmimedescription_const_char=no])])
+CPPFLAGS=$ov_save_CPPFLAGS
+AC_LANG_POP([C++])
+ov_np_getmimedescription_const=
+AS_IF([test X$ov_cv_np_getmimedescription_const_char = Xyes],
+ [ov_np_getmimedescription_const=const])
+AC_DEFINE_UNQUOTED([OPENVRML_NP_GETMIMEDESCRIPTION_CONST],
+ [$ov_np_getmimedescription_const],
+ [const if NP_GetMIMEDescription returns const char *.])
AC_PATH_XTRA
AX_CHECK_GLU
Property changes on: branches/0.18/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245
+ /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247
Modified: branches/0.18/src/mozilla-plugin/openvrml.cpp
===================================================================
--- branches/0.18/src/mozilla-plugin/openvrml.cpp 2012-04-23 06:19:36 UTC (rev 4247)
+++ branches/0.18/src/mozilla-plugin/openvrml.cpp 2012-04-23 06:47:59 UTC (rev 4248)
@@ -215,7 +215,7 @@
{
}
-char * NP_GetMIMEDescription()
+OPENVRML_NP_GETMIMEDESCRIPTION_CONST char * NP_GetMIMEDescription()
{
return NPP_GetMIMEDescription();
}
@@ -380,13 +380,13 @@
return err;
}
-char * NPP_GetMIMEDescription()
+OPENVRML_NP_GETMIMEDESCRIPTION_CONST char * NPP_GetMIMEDescription()
{
static const char mimeDescription[] =
"model/x3d-vrml:x3dv:X3D world;"
"model/vrml:wrl:VRML world;"
"x-world/x-vrml:wrl:VRML world";
- return const_cast<char *>(&mimeDescription[0]);
+ return &mimeDescription[0];
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
