Kaydet (Commit) e6d0daef authored tarafından Luboš Luňák's avatar Luboš Luňák

build also with older npapi

They were apparently lame enough to make a source-incompatible
change without changing API version or anything similar.
üst 46fd2a3b
......@@ -188,6 +188,7 @@ export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
export HAVE_GETOPT=@HAVE_GETOPT@
export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
export HAVE_READDIR_R=@HAVE_READDIR_R@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
......
......@@ -7192,6 +7192,7 @@ AC_SUBST(NSS_LIBS)
dnl ===================================================================
dnl Check for system mozilla headers
dnl ===================================================================
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
AC_MSG_CHECKING([which mozilla headers to use])
if test "$with_system_mozilla_headers" = "yes"; then
AC_MSG_RESULT([external])
......@@ -7206,12 +7207,31 @@ if test "$with_system_mozilla_headers" = "yes"; then
if test "x$LOCATED" != "xyes"; then
AC_MSG_ERROR([npapi.h header file not found])
fi
AC_LANG_PUSH([C])
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS"
AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[
#define XP_UNIX
#include <npapi.h>
const char* NPP_GetMIMEDescription(void) { return "foo"; }
]])],
[AC_MSG_RESULT([const char*])],
[
AC_MSG_RESULT([char*])
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE
])
CFLAGS=$save_CFLAGS
AC_LANG_POP([C])
else
AC_MSG_RESULT([internal])
SYSTEM_MOZILLA_HEADERS=NO
fi
AC_SUBST(MOZILLA_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_MOZILLA_HEADERS)
AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
dnl ===================================================================
dnl Check for system sane
......
......@@ -48,6 +48,12 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\
-DMOZ_X11 \
))
ifeq ($(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION),TRUE)
$(eval $(call gb_Library_add_defs,npsoplugin,\
-DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 \
))
endif
ifeq ($(filter-out LINUX FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
$(eval $(call gb_Library_add_defs,npsoplugin,\
-DNP_LINUX \
......
......@@ -361,7 +361,10 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
const char*
#ifndef HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION
const
#endif
char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin, NPP_GetMIMEDescription:%s.\n", pMimeTypes);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment