mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-29 03:44:37 +00:00
Fix HP-UX/Forte bustage by getting rid of useless & ambigious intermediate FragmentBits struct and declaring mState as a struct inside the union.
r/sr=jag
This commit is contained in:
parent
ddc0048d69
commit
f1623c011a
@ -221,12 +221,6 @@ public:
|
||||
protected:
|
||||
void ReleaseText();
|
||||
|
||||
struct FragmentBits {
|
||||
PRBool mInHeap : 1;
|
||||
PRBool mIs2b : 1;
|
||||
PRUint32 mLength : 30;
|
||||
};
|
||||
|
||||
union {
|
||||
const PRUnichar *m2b;
|
||||
const unsigned char *m1b;
|
||||
@ -234,7 +228,11 @@ protected:
|
||||
|
||||
union {
|
||||
PRUint32 mAllBits;
|
||||
FragmentBits mState;
|
||||
struct {
|
||||
PRBool mInHeap : 1;
|
||||
PRBool mIs2b : 1;
|
||||
PRUint32 mLength : 30;
|
||||
} mState;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -221,12 +221,6 @@ public:
|
||||
protected:
|
||||
void ReleaseText();
|
||||
|
||||
struct FragmentBits {
|
||||
PRBool mInHeap : 1;
|
||||
PRBool mIs2b : 1;
|
||||
PRUint32 mLength : 30;
|
||||
};
|
||||
|
||||
union {
|
||||
const PRUnichar *m2b;
|
||||
const unsigned char *m1b;
|
||||
@ -234,7 +228,11 @@ protected:
|
||||
|
||||
union {
|
||||
PRUint32 mAllBits;
|
||||
FragmentBits mState;
|
||||
struct {
|
||||
PRBool mInHeap : 1;
|
||||
PRBool mIs2b : 1;
|
||||
PRUint32 mLength : 30;
|
||||
} mState;
|
||||
};
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user