mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
declare methode in protect. Remove unnecessary INTEL_CHANGE ifdef, add () to #define
This commit is contained in:
parent
29c79096cf
commit
75015be57c
@ -28,7 +28,7 @@
|
||||
// those invalid GB cells will be mapped to unicode GB_UNDEFINED = 0xFFFF
|
||||
|
||||
#define GB_UNDEFINED 0xFFFF
|
||||
#define MAX_GB_LENGTH (0x77-0x20)*(0x7e-0x20)
|
||||
#define MAX_GB_LENGTH ((0x77-0x20)*(0x7e-0x20))
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
@ -17,14 +17,11 @@
|
||||
* Netscape Communications Corporation. All Rights Reserved.
|
||||
*/
|
||||
|
||||
#define INTEL_CHANGE
|
||||
|
||||
#include "nsGB2312ToUnicodeV2.h"
|
||||
#include "nsUCvCnDll.h"
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
#include "gbu.h"
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Global functions and data [declaration]
|
||||
@ -86,7 +83,6 @@ NS_IMETHODIMP nsGB2312ToUnicodeV2::GetMaxLength(const char * aSrc,
|
||||
|
||||
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
|
||||
//Overwriting the ConvertNoBuff() in nsUCvCnSupport.cpp.
|
||||
//side effects: all the helper functions called by UCvCnSupport are deprecated
|
||||
@ -153,5 +149,3 @@ NS_IMETHODIMP nsGB2312ToUnicodeV2::ConvertNoBuff(const char* aSrc,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -47,12 +47,10 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
NS_IMETHOD ConvertNoBuff(const char* aSrc,
|
||||
PRInt32 * aSrcLength,
|
||||
PRUnichar *aDest,
|
||||
PRInt32 * aDestLength);
|
||||
#endif
|
||||
PRInt32 * aSrcLength,
|
||||
PRUnichar *aDest,
|
||||
PRInt32 * aDestLength);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// Subclassing of nsDecoderSupport class [declaration]
|
||||
|
@ -17,16 +17,12 @@
|
||||
* Netscape Communications Corporation. All Rights Reserved.
|
||||
*/
|
||||
|
||||
#define INTEL_CHANGE
|
||||
|
||||
#include "nsUnicodeToGB2312V2.h"
|
||||
#include "nsUCvCnDll.h"
|
||||
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
#define _GBU_TABLE_ // make the table in the include file to be extern
|
||||
#include "gbu.h"
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Global functions and data [declaration]
|
||||
@ -61,7 +57,6 @@ nsUnicodeToGB2312V2::nsUnicodeToGB2312V2()
|
||||
{
|
||||
}
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
@ -149,7 +144,6 @@ NS_IMETHODIMP nsUnicodeToGB2312V2::ConvertNoBuff(const PRUnichar * aSrc,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
nsresult nsUnicodeToGB2312V2::CreateInstance(nsISupports ** aResult)
|
||||
{
|
||||
|
@ -47,12 +47,10 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
#ifdef INTEL_CHANGE
|
||||
NS_IMETHOD ConvertNoBuff(const PRUnichar * aSrc,
|
||||
PRInt32 * aSrcLength,
|
||||
char * aDest,
|
||||
PRInt32 * aDestLength);
|
||||
#endif
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// Subclassing of nsEncoderSupport class [declaration]
|
||||
|
Loading…
Reference in New Issue
Block a user