зеркало из https://github.com/mozilla/pjs.git
removing old NSPR20 #ifdefs
This commit is contained in:
Родитель
94f39f30df
Коммит
ffd5407695
|
@ -49,11 +49,7 @@ extern "C" {
|
|||
extern int MK_POP3_PASSWORD_UNDEFINED;
|
||||
}
|
||||
|
||||
#ifndef NSPR20
|
||||
PR_LOG_DEFINE(IMAP);
|
||||
#else
|
||||
PRLogModuleInfo *IMAP;
|
||||
#endif
|
||||
|
||||
MSG_Master::MSG_Master(MSG_Prefs* prefs)
|
||||
{
|
||||
|
@ -66,11 +62,8 @@ MSG_Master::MSG_Master(MSG_Prefs* prefs)
|
|||
m_prefs = prefs;
|
||||
m_prefs->AddNotify(this);
|
||||
|
||||
#ifndef NSPR20
|
||||
PR_LogInit(&IMAPLog);
|
||||
#else
|
||||
|
||||
IMAP = PR_NewLogModule("IMAP");
|
||||
#endif
|
||||
// on the mac, use this java script preference
|
||||
// as an alternate to setenv
|
||||
XP_Bool imapIOlogging;
|
||||
|
|
|
@ -620,13 +620,9 @@ MSG_ProcessMdnNeededState::CreateFirstPart()
|
|||
win_csid = INTL_DefaultWinCharSetID(m_pane->GetContext());
|
||||
m_csid = INTL_DefaultMailCharSetID(win_csid);
|
||||
|
||||
#ifndef NSPR20
|
||||
PRTime now;
|
||||
PR_ExplodeTime(&now, PR_Now());
|
||||
#else
|
||||
|
||||
PRExplodedTime now;
|
||||
PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
|
||||
#endif /* NSPR20 */
|
||||
|
||||
/* Use PR_FormatTimeUSEnglish() to format the date in US English format,
|
||||
then figure out what our local GMT offset is, and append it (since
|
||||
|
|
Загрузка…
Ссылка в новой задаче