Fix compiler error on AIX...

Can't have 'protected' structures, so for AIX make them public and then
make sure that the AIX is defined in the Makefile.in

layout/generic/nsLineLayout.h

@@ -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;

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

layout/html/base/src/nsLineLayout.h

@@ -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;