fix for VC 5.0 build breakage. The next step, after the tree opens, is to remove the NS_DECLARE_ID(kI*) stuff. But this can be done later. kin has confirmed that this fixes the VC 5.0 build breakage.

This commit is contained in:
sspitzer%netscape.com 1999-07-26 17:01:11 +00:00
parent 1efbc9ec54
commit d3c1cc965b
2 changed files with 15 additions and 0 deletions

View File

@ -28,6 +28,10 @@
NS_DECLARE_ID(kIUnicodeDecoderIID,
0xb2f178e1, 0x832a, 0x11d2, 0x8a, 0x8e, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
#define NS_IUNICODEDECODER_IID \
{ 0xb2f178e1, 0x832a, 0x11d2, \
{ 0x8a, 0x8e, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36 }}
// XXX deprecated
/*---------- BEGIN DEPRECATED */
#define NS_EXACT_LENGTH \
@ -68,6 +72,7 @@ NS_DECLARE_ID(kIUnicodeDecoderIID,
class nsIUnicodeDecoder : public nsISupports
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICODEDECODER_IID)
enum {
kOnError_Recover, // on an error, recover and continue

View File

@ -29,11 +29,19 @@
NS_DECLARE_ID(kIUnicodeEncoderIID,
0x2b2ca3d0, 0xa4c9, 0x11d2, 0x8a, 0xa1, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
#define NS_IUNICODEENCODER_IID \
{ 0x2b2ca3d0, 0xa4c9, 0x11d2, \
{ 0x8a, 0xa1, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36 }}
// Interface ID for our Unicode Character Encoder interface
// {299BCCD0-C6DF-11d2-8AA8-00600811A836}
NS_DECLARE_ID(kIUnicharEncoderIID,
0x299bccd0, 0xc6df, 0x11d2, 0x8a, 0xa8, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
#define NS_IUNICHARENCODER_IID \
{ 0x299bccd0, 0xc6df, 0x11d2, \
{0x8a, 0xa8, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36 }}
#define NS_OK_UENC_EXACTLENGTH \
NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x21)
@ -56,6 +64,7 @@ NS_DECLARE_ID(kIUnicharEncoderIID,
class nsIUnicharEncoder : public nsISupports
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICHARENCODER_IID)
/**
* Converts a character from Unicode to a Charset.
@ -72,6 +81,7 @@ public:
class nsIUnicodeEncoder : public nsISupports
{
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IUNICODEENCODER_IID)
enum {
kOnError_Signal, // on an error, stop and signal