diff --git a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp index c3fbaf81a95..775c4915299 100644 --- a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +++ b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp @@ -124,7 +124,6 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale, // generate data/time string char *old_locale = setlocale(LC_TIME, NULL); (void) setlocale(LC_TIME, platformLocale); -#ifdef CRASHES_SEE_BUG_10412 if (strlen(fmtD) && strlen(fmtT)) { PL_strcat(fmtD, " "); PL_strcat(fmtD, fmtT); @@ -139,12 +138,6 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale, else { PL_strcpy(strOut, ""); } -#else -#ifdef DEBUG - printf("date is hacked out to work around #10412\n"); -#endif /* DEBUG */ - PL_strcpy(strOut, ""); -#endif /* CRASHES_SEE_BUG_10412 */ (void) setlocale(LC_TIME, old_locale); // convert result to unicode diff --git a/mozilla/rdf/content/src/nsRDFContentUtils.cpp b/mozilla/rdf/content/src/nsRDFContentUtils.cpp index b6e5c2f1f04..3c52f59afde 100644 --- a/mozilla/rdf/content/src/nsRDFContentUtils.cpp +++ b/mozilla/rdf/content/src/nsRDFContentUtils.cpp @@ -305,7 +305,8 @@ nsRDFContentUtils::GetTextForNode(nsIRDFNode* aNode, nsString& aResult) else if (NS_SUCCEEDED(rv = aNode->QueryInterface(kIRDFDateIID, (void**) &dateLiteral))) { PRInt64 theDate; if (NS_SUCCEEDED(rv = dateLiteral->GetValue( &theDate ))) { -#if 0 +/* sspitzer: don't switch off until #10412 is fixed. this causes crashers on UNIX. I'm investigating */ +#if 1 PRExplodedTime dateData; PR_ExplodeTime(theDate, PR_LocalTimeParameters, &dateData); char dateBuf[128];