Hiroyuki Ikezoe
ikezo****@users*****
Wed Sep 13 09:43:38 JST 2006
Index: kazehakase/ChangeLog diff -u kazehakase/ChangeLog:1.1766 kazehakase/ChangeLog:1.1767 --- kazehakase/ChangeLog:1.1766 Tue Sep 12 09:43:23 2006 +++ kazehakase/ChangeLog Wed Sep 13 09:43:38 2006 @@ -1,3 +1,9 @@ +2006-09-13 Hiroyuki Ikezoe <poinc****@ikezo*****> + + * configure.in, src/mozilla/kz-mozlauncher.cpp, + src/mozilla/nsEmbedAPI.cpp: + Check nsHelperAppLauncherDialog API with strict way. + 2006-09-12 Hiroyuki Ikezoe <poinc****@ikezo*****> * configure.in, src/mozilla/Makefile.am, Index: kazehakase/configure.in diff -u kazehakase/configure.in:1.165 kazehakase/configure.in:1.166 --- kazehakase/configure.in:1.165 Tue Sep 12 09:43:23 2006 +++ kazehakase/configure.in Wed Sep 13 09:43:38 2006 @@ -148,7 +148,7 @@ fi -CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell `$PKG_CONFIG --cflags-only-I $GECKO-xpcom`" +CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -Wconversion -Wsign-compare -Werror" CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`" AC_MSG_RESULT([$CXXFLAGS]) @@ -252,14 +252,25 @@ [AC_LANG_PROGRAM( [[#include <nsIHelperAppLauncherDialog.h>]], [[nsIHelperAppLauncherDialog *p; - PRBool b; - p->Show (nsnull, nsnull, b);]] + p->Show (nsnull, nsnull, -1);]] )], [AC_DEFINE([MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_],[1],[Define if nsIHelperAppLauncharDialog uses PRBool]) result=yes], [result=no]) AC_MSG_RESULT([$result]) +AC_MSG_CHECKING([whether NS_InitXPCOM3 exists]) + +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <nsXPCOM.h>]], + [[NS_InitXPCOM3(nsnull, nsnull, nsnull, nsnull, 0);]] + )], + [AC_DEFINE([MOZ_HAVE_NSINITXPCOM3_],[1],[Define if Gecko has NS_InitXPCOM3]) result=yes], + [result=no]) + +AC_MSG_RESULT([$result]) + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#define MOZILLA_INTERNAL_API
