mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 13:55:43 +00:00
Bug 835715: #undef LOG at the top of nsJARChannel.cpp to fix build warning about it being (re)defined later on. r=jduell
This commit is contained in:
parent
525add8767
commit
c514ca0dec
@ -36,6 +36,12 @@ static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
// Ignore any LOG macro that we inherit from arbitrary headers. (We define our
|
||||
// own LOG macro below.)
|
||||
#ifdef LOG
|
||||
#undef LOG
|
||||
#endif
|
||||
|
||||
#if defined(PR_LOGGING)
|
||||
//
|
||||
// set NSPR_LOG_MODULES=nsJarProtocol:5
|
||||
@ -43,6 +49,7 @@ static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
|
||||
static PRLogModuleInfo *gJarProtocolLog = nullptr;
|
||||
#endif
|
||||
|
||||
// If you ever want to define PR_FORCE_LOGGING in this file, see bug 545995
|
||||
#define LOG(args) PR_LOG(gJarProtocolLog, PR_LOG_DEBUG, args)
|
||||
#define LOG_ENABLED() PR_LOG_TEST(gJarProtocolLog, 4)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user