Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

# 25555

Browse Source 
r= dp@netscape.com
OS/2 changes for Mozilla - add #ifdef, change #ifdef
This commit is contained in:
mkaply%us.ibm.com 2000-02-29 15:50:48 +00:00
parent c8c934127b
commit 5fc1abd8ef
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpcom/base/nsCom.h
View File

@ -28,7 +28,7 @@
*/
#ifdef _IMPL_NS_COM
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#define NS_COM _declspec(dllexport)
#elif defined(XP_MAC)
#define NS_COM __declspec(export)
@ -36,7 +36,7 @@
#define NS_COM
#endif /* !XP_PC */
#else /* !_IMPL_NS_COM */
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#define NS_COM _declspec(dllimport)
#else /* !XP_PC */
#define NS_COM
@ -47,7 +47,7 @@
* DLL Export macro
*/
#if defined(XP_PC)
#if defined(XP_PC) && !defined(XP_OS2)
#define NS_EXPORT _declspec(dllexport)
#define NS_EXPORT_(type) type _declspec(dllexport) __stdcall

2
xpcom/base/nsError.h
View File

@ -262,7 +262,7 @@ NS_ErrorAccordingToNSPR();
////////////////////////////////////////////////////////////////////////////////
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
#pragma warning(disable: 4251) // 'nsCOMPtr<class nsIInputStream>' needs to have dll-interface to be used by clients of class 'nsInputStream'
#pragma warning(disable: 4275) // non dll-interface class 'nsISupports' used as base for dll-interface class 'nsIRDFNode'
#endif

2
xpcom/base/nsISupportsUtils.h
View File

@ -64,7 +64,7 @@
* To maintain binary compatibility of nsISupports with nsIUnknown, we are
* doing this ifdeffing.
*/
#if defined(XP_PC) && PR_BYTES_PER_LONG == 4
#if defined(XP_PC) && !defined(XP_OS2) && PR_BYTES_PER_LONG == 4
typedef unsigned long nsrefcnt;
#else
typedef PRUint32 nsrefcnt;

6
xpcom/base/nscore.h
View File

@ -30,6 +30,10 @@
#define NS_UNIX 1
#endif
#if defined(XP_OS2)
#define NS_OS2 1
#endif
#include "prtypes.h"
#ifdef __cplusplus
@ -175,7 +179,7 @@ typedef PRUint16 PRUnichar;
#endif
/* unix and beos now determine this automatically */
#if ! defined XP_UNIX && ! defined XP_BEOS
#if ! defined XP_UNIX && ! defined XP_BEOS && !defined(XP_OS2)
#define HAVE_CPP_NEW_CASTS /* we'll be optimistic. */
#endif

2
xpcom/glue/nsISupportsUtils.h
View File

@ -64,7 +64,7 @@
* To maintain binary compatibility of nsISupports with nsIUnknown, we are
* doing this ifdeffing.
*/
#if defined(XP_PC) && PR_BYTES_PER_LONG == 4
#if defined(XP_PC) && !defined(XP_OS2) && PR_BYTES_PER_LONG == 4
typedef unsigned long nsrefcnt;
#else
typedef PRUint32 nsrefcnt;