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

#56767

Browse Source 
r/a=cls,leaf
Remove XP_PC - use XP_WIN or XP_OS2 explicitly
This commit is contained in:
mkaply%us.ibm.com 2000-11-28 23:51:05 +00:00
parent 0cdc5f46fe
commit 7863bcb388
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/base/nsCom.h
View File

@ -28,19 +28,19 @@
*/
#ifdef _IMPL_NS_COM
#if defined(XP_PC) && !defined(XP_OS2)
#if defined(XP_WIN)
#define NS_COM _declspec(dllexport)
#elif defined(XP_MAC)
#define NS_COM __declspec(export)
#else /* !XP_PC */
#else /* !XP_WIN */
#define NS_COM
#endif /* !XP_PC */
#endif /* !XP_WIN */
#else /* !_IMPL_NS_COM */
#if defined(XP_PC) && !defined(XP_OS2)
#if defined(XP_WIN)
#define NS_COM _declspec(dllimport)
#else /* !XP_PC */
#else /* !XP_WIN */
#define NS_COM
#endif /* !XP_PC */
#endif /* !XP_WIN */
#endif /* !_IMPL_NS_COM */
/*
@ -111,7 +111,7 @@
#define NS_CALLBACK_(_type, _name) _type (* _name)
#define NS_CALLBACK(_name) nsresult (* _name)
#endif /* !XP_PC */
#endif /* !XP_WIN */
/* use these functions to associate get/set methods with a
C++ member variable

2
xpcom/base/nsError.h
View File

@ -264,7 +264,7 @@ NS_ErrorAccordingToNSPR();
////////////////////////////////////////////////////////////////////////////////
#if defined(XP_PC) && !defined(XP_OS2)
#if defined(XP_WIN)
#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

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

4
xpcom/base/nsMemoryImpl.cpp
View File

@ -30,7 +30,7 @@
#include "nsIEventQueueService.h"
#include "nsString.h"
#if defined(XP_PC) && !defined(XP_OS2)
#if defined(XP_WIN)
#include <windows.h>
#define NS_MEMORY_FLUSHER_THREAD
#elif defined(XP_MAC)
@ -336,7 +336,7 @@ nsMemoryImpl::HeapMinimize(PRBool aImmediate)
NS_IMETHODIMP
nsMemoryImpl::IsLowMemory(PRBool *result)
{
#if defined(XP_PC) && !defined(XP_OS2)
#if defined(XP_WIN)
MEMORYSTATUS stat;
GlobalMemoryStatus(&stat);
*result = ((float)stat.dwAvailPageFile / stat.dwTotalPageFile) < 0.1;

2
xpcom/glue/nsISupportsUtils.h
View File

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