Hiroyuki Ikezoe
ikezo****@users*****
Wed Sep 13 09:43:39 JST 2006
Index: kazehakase/src/mozilla/kz-mozlauncher.cpp diff -u kazehakase/src/mozilla/kz-mozlauncher.cpp:1.16 kazehakase/src/mozilla/kz-mozlauncher.cpp:1.17 --- kazehakase/src/mozilla/kz-mozlauncher.cpp:1.16 Fri Jul 22 18:14:27 2005 +++ kazehakase/src/mozilla/kz-mozlauncher.cpp Wed Sep 13 09:43:38 2006 @@ -65,10 +65,10 @@ NS_IMETHODIMP KzContentHandler::Show(nsIHelperAppLauncher *aLauncher, nsISupports *aContext, -#ifdef HAVE_GECKO_1_8 - PRUint32 aForced) -#else +#ifdef MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_ PRBool aForced) +#else + PRUint32 aForced) #endif { nsresult rv; Index: kazehakase/src/mozilla/nsEmbedAPI.cpp diff -u kazehakase/src/mozilla/nsEmbedAPI.cpp:1.4 kazehakase/src/mozilla/nsEmbedAPI.cpp:1.5 --- kazehakase/src/mozilla/nsEmbedAPI.cpp:1.4 Fri Sep 30 11:49:49 2005 +++ kazehakase/src/mozilla/nsEmbedAPI.cpp Wed Sep 13 09:43:38 2006 @@ -74,7 +74,7 @@ #endif -#ifdef HAVE_GECKO_1_8 +#ifdef MOZ_HAVE_NSINITXPCOM3_ NS_METHOD NS_InitEmbedding(nsILocalFile *mozBinDirectory, nsIDirectoryServiceProvider *appFileLocProvider, @@ -99,7 +99,7 @@ #endif { // Initialise XPCOM -#ifdef HAVE_GECKO_1_8 +#ifdef MOZ_HAVE_NSINITXPCOM3_ rv = NS_InitXPCOM3(&sServiceManager, mozBinDirectory, appFileLocProvider, aStaticComponents, aStaticComponentCount); #else