зеркало из https://github.com/mozilla/pjs.git
fixed ifdef error from landing layout integration branch
This commit is contained in:
Родитель
35976a0c90
Коммит
da8c79611c
|
@ -928,7 +928,7 @@ BOOL CNetscapeApp::InitInstance()
|
||||||
else
|
else
|
||||||
m_bUseLockedPrefs = FALSE;
|
m_bUseLockedPrefs = FALSE;
|
||||||
|
|
||||||
#ifdef MOZ_NGLAYOUT
|
#ifndef MOZ_NGLAYOUT
|
||||||
// Frame creation may cause the loading of the home page so register
|
// Frame creation may cause the loading of the home page so register
|
||||||
// all of the parser and network functions first
|
// all of the parser and network functions first
|
||||||
static PA_InitData parser_data;
|
static PA_InitData parser_data;
|
||||||
|
@ -1144,7 +1144,7 @@ BOOL CNetscapeApp::InitInstance()
|
||||||
NET_RegisterContentTypeConverter(TEXT_MDL, FO_PRINT, NULL, INTL_ConvCharCode);
|
NET_RegisterContentTypeConverter(TEXT_MDL, FO_PRINT, NULL, INTL_ConvCharCode);
|
||||||
NET_RegisterContentTypeConverter(TEXT_PLAIN, FO_PRINT, NULL, NET_PlainTextConverter);
|
NET_RegisterContentTypeConverter(TEXT_PLAIN, FO_PRINT, NULL, NET_PlainTextConverter);
|
||||||
NET_RegisterContentTypeConverter(UNKNOWN_CONTENT_TYPE, FO_PRINT, NULL, NET_PlainTextConverter);
|
NET_RegisterContentTypeConverter(UNKNOWN_CONTENT_TYPE, FO_PRINT, NULL, NET_PlainTextConverter);
|
||||||
#ifdef MOZ_NGLAYOUT
|
#ifndef MOZ_NGLAYOUT
|
||||||
NET_RegisterContentTypeConverter(INTERNAL_PARSER, FO_PRINT, (void *)&parser_data, PA_BeginParseMDL);
|
NET_RegisterContentTypeConverter(INTERNAL_PARSER, FO_PRINT, (void *)&parser_data, PA_BeginParseMDL);
|
||||||
#endif /* MOZ_NGLAYOUT */
|
#endif /* MOZ_NGLAYOUT */
|
||||||
NET_RegisterContentTypeConverter(IMAGE_GIF, FO_PRINT, NULL, IL_ViewStream);
|
NET_RegisterContentTypeConverter(IMAGE_GIF, FO_PRINT, NULL, IL_ViewStream);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче