mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +00:00
Removing remnants of warren's s/printf/PRINTF/ landing from the tree. b=94480 r=pavlov sr=darin
This commit is contained in:
parent
ec204b41e9
commit
83d24ad2c1
@ -38,10 +38,6 @@
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef TxLog_h__
|
||||
#define Txog_h__
|
||||
|
||||
#define PRINTF(fu,bar)
|
||||
#define FLUSH()
|
||||
#define NS_IMPL_LOG(log)
|
||||
#define TxLog_h__
|
||||
|
||||
#endif
|
||||
|
@ -62,7 +62,6 @@
|
||||
#include "nsNetCID.h"
|
||||
#include "nsIDOMClassInfo.h"
|
||||
#include "nsIConsoleService.h"
|
||||
#include "nslog.h"
|
||||
#else
|
||||
#include "printers.h"
|
||||
#include "TxLog.h"
|
||||
|
@ -38,13 +38,6 @@
|
||||
#include "nsAbOutlookCard.h"
|
||||
#include "nsAbWinHelper.h"
|
||||
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsAbOutlookCardLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsAbOutlookCardLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsAbOutlookCardLog)
|
||||
|
||||
extern const char *kOutlookDirectoryScheme ;
|
||||
extern const char *kOutlookCardScheme ;
|
||||
|
||||
|
@ -48,13 +48,6 @@
|
||||
|
||||
#include "prprf.h"
|
||||
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsAbOutlookDirFactoryLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsAbOutlookDirFactoryLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsAbOutlookDirFactoryLog)
|
||||
|
||||
|
||||
// In case someone is wondering WHY I have to undefine CreateDirectory,
|
||||
// it's because the windows files winbase.h and wininet.h define this
|
||||
|
@ -53,13 +53,6 @@
|
||||
#include "prprf.h"
|
||||
#include "prthread.h"
|
||||
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsAbOutlookDirectoryLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsAbOutlookDirectoryLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsAbOutlookDirectoryLog)
|
||||
|
||||
|
||||
// Class for the int key
|
||||
class nsIntegerKey : public nsHashKey
|
||||
|
@ -49,13 +49,6 @@
|
||||
|
||||
#include <mapiguid.h>
|
||||
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsAbWinHelperLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsAbWinHelperLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsAbWinHelperLog)
|
||||
|
||||
// Small utility to ensure release of all MAPI interfaces
|
||||
template <class tInterface> struct nsMapiInterfaceWrapper
|
||||
{
|
||||
|
@ -39,13 +39,6 @@
|
||||
#include "nsAbUtils.h"
|
||||
#include "nsAutoLock.h"
|
||||
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsMapiAddressBookLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsMapiAddressBookLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsMapiAddressBookLog)
|
||||
|
||||
|
||||
HMODULE nsMapiAddressBook::mLibrary = NULL ;
|
||||
PRInt32 nsMapiAddressBook::mLibUsage = 0 ;
|
||||
|
@ -38,12 +38,6 @@
|
||||
#include "nsWabAddressBook.h"
|
||||
#include "nsAbUtils.h"
|
||||
#include "nsAutoLock.h"
|
||||
#include "nslog.h"
|
||||
|
||||
NS_IMPL_LOG(nsWabAddressBookLog)
|
||||
|
||||
#define PRINTF NS_LOG_PRINTF(nsWabAddressBookLog)
|
||||
#define FLUSH NS_LOG_FLUSH(nsWabAddressBookLog)
|
||||
|
||||
HMODULE nsWabAddressBook::mLibrary = NULL ;
|
||||
PRInt32 nsWabAddressBook::mLibUsage = 0 ;
|
||||
|
@ -49,7 +49,6 @@
|
||||
|
||||
#include "nsMemoryImpl.h"
|
||||
#include "nsErrorService.h"
|
||||
#include "nsLogging.h"
|
||||
#include "nsArena.h"
|
||||
#include "nsByteBuffer.h"
|
||||
#ifdef PAGE_MANAGER
|
||||
@ -106,7 +105,6 @@
|
||||
|
||||
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
|
||||
static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID);
|
||||
static NS_DEFINE_CID(kLoggingServiceCID, NS_LOGGINGSERVICE_CID);
|
||||
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsProcess);
|
||||
@ -198,10 +196,6 @@ static nsModuleComponentInfo components[] = {
|
||||
#define NS_ERRORSERVICE_CLASSNAME NS_ERRORSERVICE_NAME
|
||||
COMPONENT(ERRORSERVICE, nsErrorService::Create),
|
||||
|
||||
#ifdef NS_ENABLE_LOGGING
|
||||
COMPONENT(LOGGINGSERVICE, nsLoggingService::Create),
|
||||
#endif
|
||||
|
||||
COMPONENT(ARENA, ArenaImpl::Create),
|
||||
COMPONENT(BYTEBUFFER, ByteBufferImpl::Create),
|
||||
COMPONENT(SCRIPTABLEINPUTSTREAM, nsScriptableInputStream::Create),
|
||||
@ -423,11 +417,6 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
|
||||
nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager();
|
||||
NS_IF_RELEASE(iim);
|
||||
|
||||
// get the logging service so that it gets registered with the service
|
||||
// manager, and later unregistered
|
||||
#ifdef NS_ENABLE_LOGGING
|
||||
nsCOMPtr<nsILoggingService> logServ = do_GetService(kLoggingServiceCID, &rv);
|
||||
#endif
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user