If IE on mac wasn't dead and buried someone could have fixed bug 205483 (opened 2003-05-13 04:00:05 PDT). I don't really know this code, but removing all the mac parts seems to work fine. I've been trying to use "ifdef" instead of "if defined", but I can revert that if someone disagrees.

Comment on attachment 320309 [details] [diff] [review] Remove the mac parts We'll probably prefer to use the migrator for static bookmark import anyway.

Comment on attachment 320309 [details] [diff] [review] Remove the mac parts >Index: suite/browser/src/nsBookmarksService.cpp >=================================================================== > #ifdef DEBUG_varga > PRTime now; >-#if defined(XP_MAC) >- Microseconds((UnsignedWide *)&now); >-#else > now = PR_Now(); >-#endif > printf("Start reading in bookmarks.html\n"); > #endif You could just do PRTime now = PR_Now(); or maybe even better PRTime now(PR_Now()); >-#elif defined(XP_BEOS) >+#else > rv = NS_GetSpecialDirectory(NS_BEOS_SETTINGS_DIR, getter_AddRefs(systemBookmarksFolder)); This is wrong, because it'll enable the BEOS part for all platforms except XP_WIN. > #ifdef DEBUG_varga > PRTime now2; >-#if defined(XP_MAC) >- Microseconds((UnsignedWide *)&now2); >-#else > now2 = PR_Now(); >-#endif See above. >Index: suite/browser/src/nsBookmarksService.h >=================================================================== >-#ifdef DEBUG >-#if defined(XP_MAC) || defined(XP_MACOSX) >-#include <Timer.h> >-#endif >-#endif I wonder why <Timer.h> was included for XP_MACOSX in the first place, but I guess it's not important anymore anyway.

(picked the PRTime now = PR_Now(); style in varga's debug blocks) > >-#elif defined(XP_BEOS) > >+#else > > rv = NS_GetSpecialDirectory(NS_BEOS_SETTINGS_DIR, getter_AddRefs(systemBookmarksFolder)); > > This is wrong, because it'll enable the BEOS part for all platforms except > XP_WIN. > The code is in a "#if defined(XP_WIN) || defined(XP_BEOS)" block, so it should be enough with this ;-)

(In reply to comment #2) > >Index: suite/browser/src/nsBookmarksService.h > >=================================================================== > >-#ifdef DEBUG > >-#if defined(XP_MAC) || defined(XP_MACOSX) > >-#include <Timer.h> > >-#endif > >-#endif > > I wonder why <Timer.h> was included for XP_MACOSX in the first place, but I > guess it's not important anymore anyway. It must have been for this (etc): >-#if defined(XP_MAC) >- Microseconds((UnsignedWide *)&now); >-#else See http://developer.apple.com/documentation/Carbon/Reference/Time_Manager/Reference/reference.html

Comment on attachment 321320 [details] [diff] [review] New version Seems to work fine here, although ... >Index: suite/browser/src/nsBookmarksService.cpp >=================================================================== >+ PRTime now2; = PR_Now(); ... Jan probably won't like this build error. ;-) r=me with that fixed on checkin. Sorry for misreading your last patch. :-(

Landed without incorrect ";": Checking in suite/browser/src/nsBookmarksService.cpp; /cvsroot/mozilla/suite/browser/src/nsBookmarksService.cpp,v <-- nsBookmarksService.cpp new revision: 1.353; previous revision: 1.352 done Checking in suite/browser/src/nsBookmarksService.h; /cvsroot/mozilla/suite/browser/src/nsBookmarksService.h,v <-- nsBookmarksService.h new revision: 1.43; previous revision: 1.42 done