зеркало из https://github.com/mozilla/pjs.git
Bug 327997 warning C4005: 'EXTERN_C' : macro redefinition nscore.h and winnt.h
r=darin sr=darin
This commit is contained in:
Родитель
5149b233ca
Коммит
59922a25dd
|
@ -242,14 +242,14 @@
|
|||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN_C extern "C"
|
||||
#define NS_EXTERN_C extern "C"
|
||||
#else
|
||||
#define EXTERN_C
|
||||
#define NS_EXTERN_C
|
||||
#endif
|
||||
|
||||
#define EXPORT_XPCOM_API(type) EXTERN_C NS_EXPORT type NS_FROZENCALL
|
||||
#define IMPORT_XPCOM_API(type) EXTERN_C NS_IMPORT type NS_FROZENCALL
|
||||
#define GLUE_XPCOM_API(type) EXTERN_C NS_HIDDEN_(type) NS_FROZENCALL
|
||||
#define EXPORT_XPCOM_API(type) NS_EXTERN_C NS_EXPORT type NS_FROZENCALL
|
||||
#define IMPORT_XPCOM_API(type) NS_EXTERN_C NS_IMPORT type NS_FROZENCALL
|
||||
#define GLUE_XPCOM_API(type) NS_EXTERN_C NS_HIDDEN_(type) NS_FROZENCALL
|
||||
|
||||
#ifdef _IMPL_NS_COM
|
||||
#define XPCOM_API(type) EXPORT_XPCOM_API(type)
|
||||
|
|
Загрузка…
Ссылка в новой задаче