Commit 7a7cda04 authored by seawood%netscape.com's avatar seawood%netscape.com
Browse files

Use the documented __declspec keyword instead of _declspec. 

Bug #206934 r=dougt
parent 0fa48ad4

sun-java/stubs/include/jri_md.h

+6 −6
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define JRI_MD_H



#include <assert.h>

#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs & _declspec */

#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs */



#ifdef __cplusplus

extern "C" {
@@ -83,11 +83,11 @@ extern "C" { 
#	include <windows.h>

#	if defined(_MSC_VER) || defined(__GNUC__)

#		if defined(WIN32) || defined(_WIN32)

#			define JRI_PUBLIC_API(ResultType)	_declspec(dllexport) ResultType

#			define JRI_PUBLIC_API(ResultType)  __declspec(dllexport) ResultType

#			define JRI_PUBLIC_VAR(VarType)	   VarType

#			define JRI_PUBLIC_VAR_EXP(VarType)	_declspec(dllexport) VarType

#			define JRI_PUBLIC_VAR_IMP(VarType)	_declspec(dllimport) VarType

#			define JRI_NATIVE_STUB(ResultType)	_declspec(dllexport) ResultType

#			define JRI_PUBLIC_VAR_EXP(VarType) __declspec(dllexport) VarType

#			define JRI_PUBLIC_VAR_IMP(VarType) __declspec(dllimport) VarType

#			define JRI_NATIVE_STUB(ResultType) __declspec(dllexport) ResultType

#			define JRI_CALLBACK

#		else /* !_WIN32 */

#		    if defined(_WINDLL)

xpcom/base/nscore.h

+4 −4
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ 


#ifdef NS_WIN32



#define NS_IMPORT _declspec(dllimport)

#define NS_IMPORT_(type) type _declspec(dllimport) __stdcall

#define NS_EXPORT _declspec(dllexport)

#define NS_EXPORT_(type) type _declspec(dllexport) __stdcall

#define NS_IMPORT __declspec(dllimport)

#define NS_IMPORT_(type) type __declspec(dllimport) __stdcall

#define NS_EXPORT __declspec(dllexport)

#define NS_EXPORT_(type) type __declspec(dllexport) __stdcall

#define NS_IMETHOD_(type) virtual type __stdcall

#define NS_IMETHODIMP_(type) type __stdcall

#define NS_METHOD_(type) type __stdcall

xpcom/reflect/xptcall/public/xptcall.h

+4 −4
Original line number Diff line number Diff line
@@ -58,15 +58,15 @@ 
#define XPTC_PUBLIC_API(t)    PR_IMPLEMENT(t)

#define XPTC_PUBLIC_DATA(t)   PR_IMPLEMENT_DATA(t)

#ifdef _WIN32

#    define XPTC_EXPORT           _declspec(dllexport)

#    define XPTC_EXPORT           __declspec(dllexport)

#else

#    define XPTC_EXPORT

#endif

#else

#ifdef _WIN32

#    define XPTC_PUBLIC_API(t)    _declspec(dllimport) t

#    define XPTC_PUBLIC_DATA(t)   _declspec(dllimport) t

#    define XPTC_EXPORT           _declspec(dllimport)

#    define XPTC_PUBLIC_API(t)    __declspec(dllimport) t

#    define XPTC_PUBLIC_DATA(t)   __declspec(dllimport) t

#    define XPTC_EXPORT           __declspec(dllimport)

#else

#    define XPTC_PUBLIC_API(t)    PR_IMPLEMENT(t)

#    define XPTC_PUBLIC_DATA(t)   t

xpcom/reflect/xptinfo/public/xptinfo.h

+4 −4
Original line number Diff line number Diff line
@@ -53,15 +53,15 @@ 
#define XPTI_PUBLIC_API(t)    PR_IMPLEMENT(t)

#define XPTI_PUBLIC_DATA(t)   PR_IMPLEMENT_DATA(t)

#ifdef _WIN32

#    define XPTI_EXPORT           _declspec(dllexport)

#    define XPTI_EXPORT           __declspec(dllexport)

#else

#    define XPTI_EXPORT

#endif

#else

#ifdef _WIN32

#    define XPTI_PUBLIC_API(t)    _declspec(dllimport) t

#    define XPTI_PUBLIC_DATA(t)   _declspec(dllimport) t

#    define XPTI_EXPORT           _declspec(dllimport)

#    define XPTI_PUBLIC_API(t)    __declspec(dllimport) t

#    define XPTI_PUBLIC_DATA(t)   __declspec(dllimport) t

#    define XPTI_EXPORT           __declspec(dllimport)

#else

#    define XPTI_PUBLIC_API(t)    PR_IMPLEMENT(t)

#    define XPTI_PUBLIC_DATA(t)   t

xpcom/typelib/xpt/public/xpt_arena.h

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 
#define XPT_PUBLIC_DATA(t)   PR_IMPLEMENT_DATA(t)

#else

#ifdef _WIN32

#    define XPT_PUBLIC_API(t)    _declspec(dllimport) t

#    define XPT_PUBLIC_DATA(t)   _declspec(dllimport) t

#    define XPT_PUBLIC_API(t)    __declspec(dllimport) t

#    define XPT_PUBLIC_DATA(t)   __declspec(dllimport) t

#else

#    define XPT_PUBLIC_API(t)    PR_IMPLEMENT(t)

#    define XPT_PUBLIC_DATA(t)   t