Bug 761077 - Use same xptcall stubs on FreeBSD/ia64 as on Linux/ia64. r=bsmedberg
authorJan Beich <jbeich@tormail.org>
Tue, 07 Aug 2012 20:49:07 -0400
changeset 101751 af6beb179c82fdf4d9775bf7f3cc13c27a275aec
parent 101750 0688cd4ca145b95645d5417328147bd5b948e3a5
child 101752 5ccb28fc0bee86392cf0e54860b5ef8e6463c93b
push id23250
push useremorley@mozilla.com
push dateWed, 08 Aug 2012 16:23:03 +0000
treeherdermozilla-central@b99a81e70b06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs761077
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 761077 - Use same xptcall stubs on FreeBSD/ia64 as on Linux/ia64. r=bsmedberg
xpcom/reflect/xptcall/public/genstubs.pl
xpcom/reflect/xptcall/public/xptcstubsdecl.inc
xpcom/reflect/xptcall/src/xptcprivate.h
--- a/xpcom/reflect/xptcall/public/genstubs.pl
+++ b/xpcom/reflect/xptcall/public/genstubs.pl
@@ -39,17 +39,17 @@ print OUTFILE "/* generated file - DO NO
 print OUTFILE "/* includes ",$entry_count," stub entries, and ",
               $sentinel_count," sentinel entries */\n\n";
 print OUTFILE "/*\n";
 print OUTFILE "*  declarations of normal stubs...\n";
 print OUTFILE "*  0 is QueryInterface\n";
 print OUTFILE "*  1 is AddRef\n";
 print OUTFILE "*  2 is Release\n";
 print OUTFILE "*/\n";
-print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
 for($i = 0; $i < $entry_count; $i++) {
     print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
 }
 print OUTFILE "#else\n";
 for($i = 0; $i < $entry_count; $i++) {
     print OUTFILE "NS_IMETHOD Stub",$i+3,"(PRUint64,PRUint64,\n";
     print OUTFILE " PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);\n";
 
--- a/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
+++ b/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
@@ -3,17 +3,17 @@
 /* includes 247 stub entries, and 5 sentinel entries */
 
 /*
 *  declarations of normal stubs...
 *  0 is QueryInterface
 *  1 is AddRef
 *  2 is Release
 */
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
 NS_IMETHOD Stub3();
 NS_IMETHOD Stub4();
 NS_IMETHOD Stub5();
 NS_IMETHOD Stub6();
 NS_IMETHOD Stub7();
 NS_IMETHOD Stub8();
 NS_IMETHOD Stub9();
 NS_IMETHOD Stub10();
--- a/xpcom/reflect/xptcall/src/xptcprivate.h
+++ b/xpcom/reflect/xptcall/src/xptcprivate.h
@@ -9,34 +9,34 @@
 #define xptcprivate_h___
 
 #include "xptcall.h"
 #include "nsAutoPtr.h"
 #include "mozilla/Attributes.h"
 
 class xptiInterfaceEntry;
 
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
 #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
 #else
 #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
 #endif
 
 #define SENTINEL_ENTRY(n) NS_IMETHOD Sentinel##n() = 0;
 
 class nsIXPTCStubBase : public nsISupports
 {
 public:
 #include "xptcstubsdef.inc"
 };
 
 #undef STUB_ENTRY
 #undef SENTINEL_ENTRY
 
-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
 #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
 #else
 #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
 #endif
 
 #define SENTINEL_ENTRY(n) NS_IMETHOD Sentinel##n();
 
 class nsXPTCStubBase MOZ_FINAL : public nsIXPTCStubBase