Bug 895083 - Set NS_STDCALL to nothing on WIN64. r=ehsan
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 21 Jul 2013 13:59:05 +0900
changeset 151669 86b7630f73e09db645c80a2f690687a6855cc9cb
parent 151668 f710d274e85384688e0e987b901d0f9d071ec0a6
child 151670 da377f2f8abc53662b394eaa648adeddd204cc47
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs895083
milestone25.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 895083 - Set NS_STDCALL to nothing on WIN64. r=ehsan
xpcom/base/nscore.h
--- a/xpcom/base/nscore.h
+++ b/xpcom/base/nscore.h
@@ -127,20 +127,22 @@
 #define NS_IMPORT __declspec(dllimport)
 #define NS_IMPORT_(type) __declspec(dllimport) type __stdcall
 #define NS_EXPORT __declspec(dllexport)
 #define NS_EXPORT_(type) __declspec(dllexport) type __stdcall
 #define NS_IMETHOD_(type) virtual type __stdcall
 #define NS_IMETHODIMP_(type) type __stdcall
 #define NS_METHOD_(type) type __stdcall
 #define NS_CALLBACK_(_type, _name) _type (__stdcall * _name)
-#define NS_STDCALL __stdcall
 #ifndef _WIN64
 // Win64 has only one calling convention.  __stdcall will be ignored by the compiler.
+#define NS_STDCALL __stdcall
 #define NS_HAVE_STDCALL
+#else
+#define NS_STDCALL
 #endif
 #define NS_FROZENCALL __cdecl
 
 /*
   These are needed to mark static members in exported classes, due to
   gcc bug XXX insert bug# here.
  */