зеркало из https://github.com/mozilla/gecko-dev.git
Rename conflicting global symbols to fix debug static build runtime bustage.
Bug #162918 r=serge sr=alecf
This commit is contained in:
Родитель
7ec5b51352
Коммит
0ad1825890
|
@ -61,8 +61,8 @@
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
extern PRLogModuleInfo * kPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
extern PRLogModuleInfo * kGfxPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kGfxPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -60,8 +60,8 @@ static char* nav4rounding = "font.size.nav4rounding";
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
PRLogModuleInfo * kGfxPrintingLogMod = PR_NewLogModule("printing-gfx");
|
||||
#define PR_PL(_p1) PR_LOG(kGfxPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -87,8 +87,8 @@ static NS_DEFINE_CID(kCChildCID, NS_CHILD_CID);
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
extern PRLogModuleInfo * kPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
extern PRLogModuleInfo * kLayoutPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -87,8 +87,8 @@ static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
PRLogModuleInfo * kLayoutPrintingLogMod = PR_NewLogModule("printing-layout");
|
||||
#define PR_PL(_p1) PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -87,8 +87,8 @@ static NS_DEFINE_CID(kCChildCID, NS_CHILD_CID);
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
extern PRLogModuleInfo * kPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
extern PRLogModuleInfo * kLayoutPrintingLogMod;
|
||||
#define PR_PL(_p1) PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -87,8 +87,8 @@ static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
|
|||
|
||||
#include "prlog.h"
|
||||
#ifdef PR_LOGGING
|
||||
PRLogModuleInfo * kPrintingLogMod = PR_NewLogModule("printing");
|
||||
#define PR_PL(_p1) PR_LOG(kPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
PRLogModuleInfo * kLayoutPrintingLogMod = PR_NewLogModule("printing-layout");
|
||||
#define PR_PL(_p1) PR_LOG(kLayoutPrintingLogMod, PR_LOG_DEBUG, _p1)
|
||||
#else
|
||||
#define PR_PL(_p1)
|
||||
#endif
|
||||
|
|
|
@ -349,7 +349,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType, nsIPrompt *prompt)
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
// flat file reg funcs
|
||||
static
|
||||
PRBool ReadSectionHeader(nsManifestLineReader& reader, const char *token)
|
||||
PRBool ReadSectionHeader(nsPluginManifestLineReader& reader, const char *token)
|
||||
{
|
||||
do {
|
||||
if (*reader.LinePtr() == '[') {
|
||||
|
@ -5397,7 +5397,7 @@ nsPluginHostImpl::ReadPluginInfo()
|
|||
return NS_OK; // ERROR CONDITION
|
||||
}
|
||||
|
||||
nsManifestLineReader reader;
|
||||
nsPluginManifestLineReader reader;
|
||||
char* registry = reader.Init(flen);
|
||||
if (!registry) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
@ -54,11 +54,11 @@
|
|||
|
||||
#define PLUGIN_REGISTRY_END_OF_LINE_MARKER '$'
|
||||
|
||||
class nsManifestLineReader
|
||||
class nsPluginManifestLineReader
|
||||
{
|
||||
public:
|
||||
nsManifestLineReader() {mBase = mCur = mNext = mLimit = 0;}
|
||||
~nsManifestLineReader() {delete [] mBase;}
|
||||
nsPluginManifestLineReader() {mBase = mCur = mNext = mLimit = 0;}
|
||||
~nsPluginManifestLineReader() { if (mBase) delete[] mBase; mBase=0;}
|
||||
|
||||
char* Init(PRUint32 flen)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче