Fixed compiler error on AIX. The xlC compiler does not handle protected

structures correctly so for AIX, we make the structures public.

approved by kipp@netscape.com


git-svn-id: svn://10.0.0.236/trunk@25003 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/generic/nsLineLayout.h

@@ -246,6 +246,9 @@ 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
@@ -276,9 +279,16 @@ protected:
     // Other state we use
     PRUint8 mVerticalAlign;
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerFrameData mFrameDataBuf[10];
   PerFrameData* mFrameFreeList;
 
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData {
     PerSpanData* mNext;
     PerSpanData* mPrev;
@@ -310,6 +320,10 @@ protected:
       mLastFrame = pfd;
     }
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerSpanData mSpanDataBuf[4];
   PerSpanData* mSpanFreeList;
   PerSpanData* mRootSpan;

mozilla/layout/html/base/src/Makefile.in

@@ -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 :=

mozilla/layout/html/base/src/nsLineLayout.h

@@ -246,6 +246,9 @@ 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
@@ -276,9 +279,16 @@ protected:
     // Other state we use
     PRUint8 mVerticalAlign;
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerFrameData mFrameDataBuf[10];
   PerFrameData* mFrameFreeList;
 
+#ifdef AIX
+public:
+#endif /* AIX */
   struct PerSpanData {
     PerSpanData* mNext;
     PerSpanData* mPrev;
@@ -310,6 +320,10 @@ protected:
       mLastFrame = pfd;
     }
   };
+#ifdef AIX
+protected:
+#endif /* AIX */
+
   PerSpanData mSpanDataBuf[4];
   PerSpanData* mSpanFreeList;
   PerSpanData* mRootSpan;