From c4e831c8b9f6cdc27c367acccfce67d1203b8efe Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Thu, 24 Sep 1998 20:56:58 +0000 Subject: [PATCH] Added #undef of NS_EXPORT, so it won't conflict with nsCom.h. git-svn-id: svn://10.0.0.236/trunk@10950 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/src/nscore.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/base/src/nscore.h b/mozilla/base/src/nscore.h index bd7859b8410..2eecf758a4d 100644 --- a/mozilla/base/src/nscore.h +++ b/mozilla/base/src/nscore.h @@ -66,11 +66,15 @@ typedef PRUcs2 PRUnichar; #define NS_EXPORT_(type) type _declspec(dllexport) __stdcall #elif defined(XP_MAC) -#define NS_IMPORT __declspec(import) -#define NS_IMPORT_(type) __declspec(import) type +#define NS_IMPORT +#define NS_IMPORT_(type) type -#define NS_EXPORT __declspec(export) -#define NS_EXPORT_(type) __declspec(export) type +// XXX NS_EXPORT_ defined in nsCom.h actually does an export. Here it's just sugar. +#undef NS_EXPORT +#undef NS_EXPORT_ + +#define NS_EXPORT +#define NS_EXPORT_(type) type #else /* XXX do something useful? */