Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiler error on AIX...

Browse Source 
Can't have 'protected' structures, so for AIX make them public and then
make sure that the AIX is defined in the Makefile.in
This commit is contained in:
jdunn%netscape.com 1999-03-31 04:21:53 +00:00
parent 4f3260d4a9
commit 4241b16ff7
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/generic/nsLineLayout.h
View File

@ -259,6 +259,10 @@ protected:
// state is the state needed to post-process the line after reflow
// has completed (vertical alignment, horizontal alignment,
// justification and relative positioning).
#ifdef AIX
public:
#endif /* AIX */
struct PerSpanData;
struct PerFrameData {
// link to next/prev frame in same span
@ -287,10 +291,16 @@ protected:
// 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 */
struct PerSpanData {
union {
PerSpanData* mParent;
@ -323,6 +333,9 @@ protected:
mLastFrame = pfd;
}
};
#ifdef AIX
protected:
#endif /* AIX */
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
PerSpanData* mSpanFreeList;
PRInt32 mInitialSpansFreed;

2
layout/html/base/src/Makefile.in
View File

@ -75,6 +75,8 @@ include $(topsrcdir)/config/config.mk
DEFINES += -D_IMPL_NS_HTML
CXXFLAGS += $(OS_CXXFLAGS)
INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../content/src -I$(srcdir)/../../../base/src -I$(srcdir)/. -I$(DIST)/oji
MKSHLIB :=

13
layout/html/base/src/nsLineLayout.h
View File

@ -259,6 +259,10 @@ protected:
// state is the state needed to post-process the line after reflow
// has completed (vertical alignment, horizontal alignment,
// justification and relative positioning).
#ifdef AIX
public:
#endif /* AIX */
struct PerSpanData;
struct PerFrameData {
// link to next/prev frame in same span
@ -287,10 +291,16 @@ protected:
// 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 */
struct PerSpanData {
union {
PerSpanData* mParent;
@ -323,6 +333,9 @@ protected:
mLastFrame = pfd;
}
};
#ifdef AIX
protected:
#endif /* AIX */
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];
PerSpanData* mSpanFreeList;
PRInt32 mInitialSpansFreed;