--- 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