From d2c3991938ccb65a7bdf1b71d3d257b12526b841 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com"
 <mark%moxienet.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Feb 2006 03:19:38 +0000
Subject: [PATCH] 323337 Use fastcall on Mac OS X x86:
 __attribute__(regparm(3)).  r=josh a/1.8=me a/1.8.0=dveditz

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@190790 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/jsdhash.h            | 2 +-
 mozilla/parser/expat/lib/internal.h | 2 +-
 mozilla/xpcom/base/nscore.h         | 4 ++--
 mozilla/xpcom/glue/pldhash.h        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/js/src/jsdhash.h b/mozilla/js/src/jsdhash.h
index 42a7993c714..6beecadd120 100644
--- a/mozilla/js/src/jsdhash.h
+++ b/mozilla/js/src/jsdhash.h
@@ -45,7 +45,7 @@
 
 JS_BEGIN_EXTERN_C
 
-#if defined(__GNUC__) && defined(__i386__) && (__GNUC__ >= 3) && !defined(XP_OS2) && !defined(XP_MACOSX)
+#if defined(__GNUC__) && defined(__i386__) && (__GNUC__ >= 3) && !defined(XP_OS2)
 #define JS_DHASH_FASTCALL __attribute__ ((regparm (3),stdcall))
 #else
 #define JS_DHASH_FASTCALL
diff --git a/mozilla/parser/expat/lib/internal.h b/mozilla/parser/expat/lib/internal.h
index 807d02b8d66..ff056c659cd 100644
--- a/mozilla/parser/expat/lib/internal.h
+++ b/mozilla/parser/expat/lib/internal.h
@@ -20,7 +20,7 @@
          and therefore subject to change.
 */
 
-#if defined(__GNUC__) && defined(__i386__) && !defined(XP_MACOSX)
+#if defined(__GNUC__) && defined(__i386__)
 /* We'll use this version by default only where we know it helps.
 
    regparm() generates warnings on Solaris boxes.   See SF bug #692878.
diff --git a/mozilla/xpcom/base/nscore.h b/mozilla/xpcom/base/nscore.h
index 869a8491a24..0b667924b90 100644
--- a/mozilla/xpcom/base/nscore.h
+++ b/mozilla/xpcom/base/nscore.h
@@ -140,7 +140,7 @@
  *           NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
  */
 
-#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2) && !defined(XP_MACOSX)
+#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2)
 #define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
 #else
 #define NS_FASTCALL
@@ -150,7 +150,7 @@
  * NS_DEFCALL undoes the effect of a global regparm/stdcall setting
  * so that xptcall works correctly.
  */
-#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2) && !defined(XP_MACOSX)
+#if defined(__i386__) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_OS2)
 #define NS_DEFCALL __attribute__ ((regparm (0), cdecl))
 #else
 #define NS_DEFCALL
diff --git a/mozilla/xpcom/glue/pldhash.h b/mozilla/xpcom/glue/pldhash.h
index 7c2bba92c45..494ba089814 100644
--- a/mozilla/xpcom/glue/pldhash.h
+++ b/mozilla/xpcom/glue/pldhash.h
@@ -46,7 +46,7 @@
 
 PR_BEGIN_EXTERN_C
 
-#if defined(__GNUC__) && defined(__i386__) && (__GNUC__ >= 3) && !defined(XP_OS2) && !defined(XP_MACOSX)
+#if defined(__GNUC__) && defined(__i386__) && (__GNUC__ >= 3) && !defined(XP_OS2)
 #define PL_DHASH_FASTCALL __attribute__ ((regparm (3),stdcall))
 #else
 #define PL_DHASH_FASTCALL