From 90c6795d8ff280fd66e9e3b059f8708bc39ee14c Mon Sep 17 00:00:00 2001
From: "shaver%mozilla.org" <shaver%mozilla.org>
Date: Thu, 13 Apr 2000 21:43:45 +0000
Subject: [PATCH] FreeBSD 3.4 and BSDI/4.1 tweaks from
 <joerg.brunsmann@FernUni-Hagen.de> and <drehuis@plaything.org>, respectively.

---
 .../xptcall/src/md/unix/xptc_platforms_unixish_x86.h  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h b/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
index e83d53c4e800..0a7cb2f81c9f 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
+++ b/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
@@ -59,6 +59,11 @@
 #include <osreldate.h>
 #if __FreeBSD_version >= 400015
 #define CFRONT_STYLE_THIS_ADJUST
+#elif __FreeBSD_version == 340000
+/* "FreeBSD 3.4 ships with gcc version 2.7.2.3" -- 
+ *     Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
+ */
+#define CFRONT_STYLE_THIS_ADJUST
 #else
 #define THUNK_BASED_THIS_ADJUST
 #endif
@@ -70,7 +75,13 @@
 #define THUNK_BASED_THIS_ADJUST
 
 #elif defined(__bsdi__) 
+#include <sys/param.h>
+#if _BSDI_VERSION >= 199910
+/* BSDI/4.1 ships with egcs, ergo thunk-based */
+#define THUNK_BASED_THIS_ADJUST
+#else
 #define CFRONT_STYLE_THIS_ADJUST
+#endif
 
 #elif defined(NTO) 
 #define CFRONT_STYLE_THIS_ADJUST