corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 712198 - Remove NS_WIN32, NS_UNIX and NS_OS2. r=khuey

Browse Source
This commit is contained in:
Makoto Kato
2011-12-21 14:09:17 +09:00
parent 302dc6b444
commit ec11c4f1c9
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intl/uconv/util/ubase.h
View File

@@ -37,18 +37,6 @@
#ifndef ubase_h__ #ifndef ubase_h__
#define ubase_h__ #define ubase_h__
#ifdef _WIN32
#ifndef NS_WIN32
#define NS_WIN32 1
#endif
#endif
#if defined(__unix)
#ifndef NS_UNIX
#define NS_UNIX 1
#endif
#endif
#include "prtypes.h" #include "prtypes.h"
#define PRIVATE #define PRIVATE

16
xpcom/base/nscore.h
View File

@@ -66,18 +66,6 @@ typedef size_t(*nsMallocSizeOfFun)(const void *p, size_t computedSize);
/* Core XPCOM declarations. */ /* Core XPCOM declarations. */
/**
* Macros defining the target platform...
*/
#ifdef _WIN32
#define NS_WIN32 1
#elif defined(__unix)
#define NS_UNIX 1
#elif defined(XP_OS2)
#define NS_OS2 1
#endif
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
/* Import/export defines */ /* Import/export defines */
@@ -171,7 +159,7 @@ typedef size_t(*nsMallocSizeOfFun)(const void *p, size_t computedSize);
#define NS_CONSTRUCTOR_FASTCALL #define NS_CONSTRUCTOR_FASTCALL
#endif #endif
#ifdef NS_WIN32 #ifdef XP_WIN
#define NS_IMPORT __declspec(dllimport) #define NS_IMPORT __declspec(dllimport)
#define NS_IMPORT_(type) __declspec(dllimport) type __stdcall #define NS_IMPORT_(type) __declspec(dllimport) type __stdcall
@@ -395,7 +383,7 @@ typedef PRUint32 nsrefcnt;
* commercial build. When this is fixed there will be no need for the * commercial build. When this is fixed there will be no need for the
* |reinterpret_cast| in nsLiteralString.h either. * |reinterpret_cast| in nsLiteralString.h either.
*/ */
#if defined(HAVE_CPP_2BYTE_WCHAR_T) && defined(NS_WIN32) #if defined(HAVE_CPP_2BYTE_WCHAR_T) && defined(XP_WIN)
typedef wchar_t PRUnichar; typedef wchar_t PRUnichar;
#else #else
typedef PRUint16 PRUnichar; typedef PRUint16 PRUnichar;

2
xpcom/io/nsUnicharInputStream.cpp
View File

@@ -45,7 +45,7 @@
#include "nsCRT.h" #include "nsCRT.h"
#include "nsUTF8Utils.h" #include "nsUTF8Utils.h"
#include <fcntl.h> #include <fcntl.h>
#if defined(NS_WIN32) #if defined(XP_WIN)
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>