Landing the rest of the mach-o OSX changes.

Bug #75653 r=cls sr=waterson
2001-10-27 07:38:18 +00:00
parent 5c8ab4acf0
commit 74b22d1a32
76 changed files with 1078 additions and 592 deletions
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -5215,7 +5215,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell*            aPresShell,
        ((nsMenuFrame*) newFrame)->SetFrameConstructor(this);
      }
      else if (aTag == nsXULAtoms::menubar) {
-  #if defined(XP_MAC) || defined(RHAPSODY) // The Mac uses its native menu bar.
+  #if defined(XP_MAC) || defined(XP_MACOSX) // The Mac uses its native menu bar.
        aHaltProcessing = PR_TRUE;
        return NS_OK;
  #else