From 72290bc923ccc6fddc1c5c77b180dddebff85cce Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Tue, 24 Jun 2003 22:12:37 +0000 Subject: [PATCH] Use the documented __declspec keyword instead of _declspec. Bug #206934 r=dougt git-svn-id: svn://10.0.0.236/trunk@144112 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/sun-java/stubs/include/jri_md.h | 12 ++++++------ mozilla/xpcom/base/nscore.h | 8 ++++---- mozilla/xpcom/reflect/xptcall/public/xptcall.h | 8 ++++---- mozilla/xpcom/reflect/xptinfo/public/xptinfo.h | 8 ++++---- mozilla/xpcom/typelib/xpt/public/xpt_arena.h | 4 ++-- mozilla/xpinstall/wizard/windows/setup/zipfile.h | 14 +++++++------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mozilla/sun-java/stubs/include/jri_md.h b/mozilla/sun-java/stubs/include/jri_md.h index 5c09a594542..f18093cdd7b 100644 --- a/mozilla/sun-java/stubs/include/jri_md.h +++ b/mozilla/sun-java/stubs/include/jri_md.h @@ -43,7 +43,7 @@ #define JRI_MD_H #include -#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 # if defined(_MSC_VER) || defined(__GNUC__) # if defined(WIN32) || defined(_WIN32) -# 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_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_CALLBACK # else /* !_WIN32 */ # if defined(_WINDLL) diff --git a/mozilla/xpcom/base/nscore.h b/mozilla/xpcom/base/nscore.h index 57816e7d7fd..07a36ef8a24 100644 --- a/mozilla/xpcom/base/nscore.h +++ b/mozilla/xpcom/base/nscore.h @@ -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 diff --git a/mozilla/xpcom/reflect/xptcall/public/xptcall.h b/mozilla/xpcom/reflect/xptcall/public/xptcall.h index 5717cf8b1ce..2c906706684 100644 --- a/mozilla/xpcom/reflect/xptcall/public/xptcall.h +++ b/mozilla/xpcom/reflect/xptcall/public/xptcall.h @@ -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 diff --git a/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h b/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h index 062e97bd5ce..7ff84bb8054 100644 --- a/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h +++ b/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h @@ -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 diff --git a/mozilla/xpcom/typelib/xpt/public/xpt_arena.h b/mozilla/xpcom/typelib/xpt/public/xpt_arena.h index 2d24cc39bd5..058a7655897 100644 --- a/mozilla/xpcom/typelib/xpt/public/xpt_arena.h +++ b/mozilla/xpcom/typelib/xpt/public/xpt_arena.h @@ -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 diff --git a/mozilla/xpinstall/wizard/windows/setup/zipfile.h b/mozilla/xpinstall/wizard/windows/setup/zipfile.h index bfc13221bb2..f0477212608 100644 --- a/mozilla/xpinstall/wizard/windows/setup/zipfile.h +++ b/mozilla/xpinstall/wizard/windows/setup/zipfile.h @@ -51,21 +51,21 @@ PR_BEGIN_EXTERN_C * If successful OpenArchive returns a handle in the hZip parameter * that must be passed to all subsequent operations on the archive */ -extern _declspec(dllexport)int ZIP_OpenArchive( const char * zipname, void** hZip ); -extern _declspec(dllexport)int ZIP_CloseArchive( void** hZip ); +extern __declspec(dllexport)int ZIP_OpenArchive( const char * zipname, void** hZip ); +extern __declspec(dllexport)int ZIP_CloseArchive( void** hZip ); /* Test the integrity of every item in this open archive * by verifying each item's checksum against the stored * CRC32 value. */ -extern _declspec(dllexport)int ZIP_TestArchive( void* hZip ); +extern __declspec(dllexport)int ZIP_TestArchive( void* hZip ); /* Extract the named file in the archive to disk. * This function will happily overwrite an existing Outfile if it can. * It's up to the caller to detect or move it out of the way if it's important. */ -extern _declspec(dllexport)int ZIP_ExtractFile( void* hZip, const char * filename, const char * outname ); +extern __declspec(dllexport)int ZIP_ExtractFile( void* hZip, const char * filename, const char * outname ); /* Functions to list the files contained in the archive @@ -82,9 +82,9 @@ extern _declspec(dllexport)int ZIP_ExtractFile( void* hZip, const char * filenam * will return ZIP_ERR_SMALLBUF. When no more matches can be found in * the archive it will return ZIP_ERR_FNF */ -extern _declspec(dllexport)void* ZIP_FindInit( void* hZip, const char * pattern ); -extern _declspec(dllexport)int ZIP_FindNext( void* hFind, char * outbuf, int bufsize ); -extern _declspec(dllexport)int ZIP_FindFree( void* hFind ); +extern __declspec(dllexport)void* ZIP_FindInit( void* hZip, const char * pattern ); +extern __declspec(dllexport)int ZIP_FindNext( void* hFind, char * outbuf, int bufsize ); +extern __declspec(dllexport)int ZIP_FindFree( void* hFind ); PR_END_EXTERN_C