ANSIC requires that structures need 'friend' status to access other structures

IF they are protected (or private).  fix for bug 4642
This commit is contained in:
jdunn%netscape.com 1999-04-12 20:12:15 +00:00
parent 438e2e98d6
commit 7af07e06fa
2 changed files with 10 additions and 16 deletions

View File

@ -246,10 +246,10 @@ protected:
// has completed (vertical alignment, horizontal alignment,
// justification and relative positioning).
#ifdef AIX
public:
#endif /* AIX */
struct PerSpanData;
struct PerFrameData;
friend struct PerSpanData;
friend struct PerFrameData;
struct PerFrameData {
// link to next/prev frame in same span
PerFrameData* mNext;
@ -277,16 +277,13 @@ public:
// Other state we use
PRUint8 mVerticalAlign;
};
#ifdef AIX
protected:
#endif /* AIX */
PerFrameData mFrameDataBuf[NS_LINELAYOUT_NUM_FRAMES];
PerFrameData* mFrameFreeList;
PRInt32 mInitialFramesFreed;
#ifdef AIX
public:
#endif /* AIX */
#endif
struct PerSpanData {
union {
PerSpanData* mParent;
@ -321,7 +318,7 @@ public:
};
#ifdef AIX
protected:
#endif /* AIX */
#endif
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
PerSpanData* mSpanFreeList;
PRInt32 mInitialSpansFreed;

View File

@ -246,10 +246,10 @@ protected:
// has completed (vertical alignment, horizontal alignment,
// justification and relative positioning).
#ifdef AIX
public:
#endif /* AIX */
struct PerSpanData;
struct PerFrameData;
friend struct PerSpanData;
friend struct PerFrameData;
struct PerFrameData {
// link to next/prev frame in same span
PerFrameData* mNext;
@ -277,16 +277,13 @@ public:
// Other state we use
PRUint8 mVerticalAlign;
};
#ifdef AIX
protected:
#endif /* AIX */
PerFrameData mFrameDataBuf[NS_LINELAYOUT_NUM_FRAMES];
PerFrameData* mFrameFreeList;
PRInt32 mInitialFramesFreed;
#ifdef AIX
public:
#endif /* AIX */
#endif
struct PerSpanData {
union {
PerSpanData* mParent;
@ -321,7 +318,7 @@ public:
};
#ifdef AIX
protected:
#endif /* AIX */
#endif
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
PerSpanData* mSpanFreeList;
PRInt32 mInitialSpansFreed;