Bug 838803 - Remove HAVE_STDCALL to work around clang bug. r=glandium

--HG--
extra : rebase_source : e1cdb524a4f7f0742f2051e5915e5e21db4c0423
This commit is contained in:
Benoit Girard 2013-07-16 22:01:50 -04:00
parent c84ff42c47
commit 82435a9c18
4 changed files with 3 additions and 31 deletions

View File

@ -2241,7 +2241,6 @@ ia64*-hpux*)
CXXFLAGS="$CXXFLAGS -mstackrealign -fno-keep-inline-dllexport"
LDFLAGS="$LDFLAGS -Wl,--enable-stdcall-fixup -Wl,--large-address-aware"
else
AC_DEFINE(HAVE_STDCALL)
DSO_LDOPTS="$DSO_LDOPTS -MACHINE:X86"
LDFLAGS="$LDFLAGS -SAFESEH"
fi
@ -2630,20 +2629,6 @@ AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_LANG_CPLUSPLUS
AC_MSG_CHECKING(for __stdcall)
AC_CACHE_VAL(ac_cv___stdcall,
[AC_TRY_COMPILE([template <typename Method> struct foo;
template <> struct foo<void (*)()> {};
template <> struct foo<void (__stdcall*)()> {};],
[],
[ac_cv___stdcall=true],
[ac_cv___stdcall=false])])
if test "$ac_cv___stdcall" = true ; then
AC_DEFINE(HAVE_STDCALL)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AC_LANG_C
AC_MSG_CHECKING(for ssize_t)
AC_CACHE_VAL(ac_cv_type_ssize_t,

View File

@ -2230,20 +2230,6 @@ AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_LANG_CPLUSPLUS
AC_MSG_CHECKING(for __stdcall)
AC_CACHE_VAL(ac_cv___stdcall,
[AC_TRY_COMPILE([template <typename Method> struct foo;
template <> struct foo<void (*)()> {};
template <> struct foo<void (__stdcall*)()> {};],
[],
[ac_cv___stdcall=true],
[ac_cv___stdcall=false])])
if test "$ac_cv___stdcall" = true ; then
AC_DEFINE(HAVE_STDCALL)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AC_LANG_C
AC_MSG_CHECKING(for ssize_t)
AC_CACHE_VAL(ac_cv_type_ssize_t,

View File

@ -133,6 +133,7 @@
#define NS_METHOD_(type) type __stdcall
#define NS_CALLBACK_(_type, _name) _type (__stdcall * _name)
#define NS_STDCALL __stdcall
#define NS_HAVE_STDCALL
#define NS_FROZENCALL __cdecl
/*

View File

@ -321,9 +321,9 @@ struct nsRunnableMethodTraits<R (C::*)(), Owning> {
typedef nsRunnableMethod<C, R, Owning> base_type;
};
#ifdef HAVE_STDCALL
#ifdef NS_HAVE_STDCALL
template <class C, typename R, bool Owning>
struct nsRunnableMethodTraits<R (__stdcall C::*)(), Owning> {
struct nsRunnableMethodTraits<R (NS_STDCALL C::*)(), Owning> {
typedef C class_type;
typedef R return_type;
typedef nsRunnableMethod<C, R, Owning> base_type;