From 1bc2cebda2c25dba8f9e07493b5bb9b476319aa8 Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Wed, 24 Mar 1999 21:55:53 +0000 Subject: [PATCH] backing out changes, because the tree was closed - doh git-svn-id: svn://10.0.0.236/trunk@25005 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/tests/FilesTest.cpp | 14 +++++++------- mozilla/layout/generic/nsLineLayout.h | 14 -------------- mozilla/layout/html/base/src/Makefile.in | 2 -- mozilla/layout/html/base/src/nsLineLayout.h | 14 -------------- mozilla/xpcom/tests/FilesTest.cpp | 14 +++++++------- 5 files changed, 14 insertions(+), 44 deletions(-) diff --git a/mozilla/base/tests/FilesTest.cpp b/mozilla/base/tests/FilesTest.cpp index d30fe21e7f5..f453861aa96 100644 --- a/mozilla/base/tests/FilesTest.cpp +++ b/mozilla/base/tests/FilesTest.cpp @@ -593,7 +593,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_DriveDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -605,7 +605,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_TemporaryDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -617,7 +617,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_CurrentProcessDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -765,7 +765,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Win_SystemDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -777,7 +777,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Win_WindowsDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -790,7 +790,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Unix_LocalDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -803,7 +803,7 @@ int FilesTest::SpecialSystemDirectories() if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { diff --git a/mozilla/layout/generic/nsLineLayout.h b/mozilla/layout/generic/nsLineLayout.h index 5e8f0774584..b31660e4dd7 100644 --- a/mozilla/layout/generic/nsLineLayout.h +++ b/mozilla/layout/generic/nsLineLayout.h @@ -246,9 +246,6 @@ 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 @@ -279,16 +276,9 @@ public: // 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; @@ -320,10 +310,6 @@ public: mLastFrame = pfd; } }; -#ifdef AIX -protected: -#endif /* AIX */ - PerSpanData mSpanDataBuf[4]; PerSpanData* mSpanFreeList; PerSpanData* mRootSpan; diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 28b15ac84d8..054b114c6ec 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -75,8 +75,6 @@ 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 := diff --git a/mozilla/layout/html/base/src/nsLineLayout.h b/mozilla/layout/html/base/src/nsLineLayout.h index 5e8f0774584..b31660e4dd7 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.h +++ b/mozilla/layout/html/base/src/nsLineLayout.h @@ -246,9 +246,6 @@ 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 @@ -279,16 +276,9 @@ public: // 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; @@ -320,10 +310,6 @@ public: mLastFrame = pfd; } }; -#ifdef AIX -protected: -#endif /* AIX */ - PerSpanData mSpanDataBuf[4]; PerSpanData* mSpanFreeList; PerSpanData* mRootSpan; diff --git a/mozilla/xpcom/tests/FilesTest.cpp b/mozilla/xpcom/tests/FilesTest.cpp index d30fe21e7f5..f453861aa96 100644 --- a/mozilla/xpcom/tests/FilesTest.cpp +++ b/mozilla/xpcom/tests/FilesTest.cpp @@ -593,7 +593,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_DriveDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -605,7 +605,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_TemporaryDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -617,7 +617,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "OS_CurrentProcessDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -765,7 +765,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Win_SystemDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -777,7 +777,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Win_WindowsDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -790,7 +790,7 @@ int FilesTest::SpecialSystemDirectories() mConsole << "Unix_LocalDirectory yields \t"; if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else { @@ -803,7 +803,7 @@ int FilesTest::SpecialSystemDirectories() if (systemDir.Valid()) { - (nsOutputStream&)mConsole << systemDir << nsEndl; + (nsOutputStream)mConsole << systemDir << nsEndl; } else {