diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 2e39f3bb51f8..57dd6543b11e 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -151,7 +151,7 @@ #include "nsIJARChannel.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsISelectionDisplay.h" diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index d24b45645437..811e8ad02651 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -14,7 +14,7 @@ #include "nsIScriptObjectPrincipal.h" #include "nsIURI.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil) diff --git a/dom/base/nsContentPolicy.cpp b/dom/base/nsContentPolicy.cpp index db30193b386a..6c2853fd3b6f 100644 --- a/dom/base/nsContentPolicy.cpp +++ b/dom/base/nsContentPolicy.cpp @@ -8,7 +8,7 @@ * Implementation of the "@mozilla.org/layout/content-policy;1" contract. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsISupports.h" #include "nsXPCOM.h" diff --git a/dom/base/nsContentSink.h b/dom/base/nsContentSink.h index ec54393bcc16..348e91aa572a 100644 --- a/dom/base/nsContentSink.h +++ b/dom/base/nsContentSink.h @@ -24,7 +24,7 @@ #include "nsITimer.h" #include "nsStubDocumentObserver.h" #include "nsIContentSink.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsCycleCollectionParticipant.h" #include "nsThreadUtils.h" diff --git a/dom/base/nsDOMDataChannel.cpp b/dom/base/nsDOMDataChannel.cpp index e9bec18c9cb0..e1a50a479ef2 100644 --- a/dom/base/nsDOMDataChannel.cpp +++ b/dom/base/nsDOMDataChannel.cpp @@ -7,7 +7,7 @@ #include "nsDOMDataChannel.h" #include "base/basictypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetDataChannelLog(); #undef LOG diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 86e8c3ee281d..4ea8e10e18a0 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -18,7 +18,7 @@ #include "mozilla/Likely.h" #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "plstr.h" #include "prprf.h" diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index c58c5cfba121..662387cd29fc 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -174,7 +174,7 @@ #include "nsFrameLoader.h" #include "nsISupportsPrimitives.h" #include "nsXPCOMCID.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "prprf.h" diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 291e5a7c442e..fae2251523c0 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -77,7 +77,7 @@ #endif #include "AccessCheck.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prthread.h" #include "mozilla/Preferences.h" diff --git a/dom/base/nsNodeInfoManager.cpp b/dom/base/nsNodeInfoManager.cpp index ee394b2b9399..6c093159f3af 100644 --- a/dom/base/nsNodeInfoManager.cpp +++ b/dom/base/nsNodeInfoManager.cpp @@ -34,7 +34,7 @@ using namespace mozilla; using mozilla::dom::NodeInfo; -#include "prlog.h" +#include "mozilla/Logging.h" static PRLogModuleInfo* gNodeInfoManagerLeakPRLog; diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index c0adfe5ca39b..54b471dfb3b2 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -44,7 +44,7 @@ // Util headers #include "prenv.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsAutoPtr.h" #include "nsCURILoader.h" diff --git a/dom/base/nsScriptLoader.cpp b/dom/base/nsScriptLoader.cpp index e530b1d82864..1f7205d52d46 100644 --- a/dom/base/nsScriptLoader.cpp +++ b/dom/base/nsScriptLoader.cpp @@ -40,7 +40,7 @@ #include "nsThreadUtils.h" #include "nsDocShellCID.h" #include "nsIContentSecurityPolicy.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsCRT.h" #include "nsContentCreatorFunctions.h" #include "nsCORSListenerProxy.h" diff --git a/dom/camera/CameraCommon.h b/dom/camera/CameraCommon.h index b735a73717d1..a79d98469337 100644 --- a/dom/camera/CameraCommon.h +++ b/dom/camera/CameraCommon.h @@ -15,7 +15,7 @@ #endif #endif -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetCameraLog(); #define DOM_CAMERA_LOG( type, ... ) PR_LOG(GetCameraLog(), (PRLogModuleLevel)type, ( __VA_ARGS__ )) diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index 101871acf098..e7bb34cf319c 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/IMEStateManager.h" diff --git a/dom/html/nsHTMLContentSink.cpp b/dom/html/nsHTMLContentSink.cpp index bdfd62d32edf..6ffb02108f89 100644 --- a/dom/html/nsHTMLContentSink.cpp +++ b/dom/html/nsHTMLContentSink.cpp @@ -28,7 +28,7 @@ #include "nsIAppShell.h" #include "nsCRT.h" #include "prtime.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsNodeUtils.h" #include "nsIContent.h" #include "mozilla/dom/Element.h" diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index d8298b1f4b8e..d267523794a6 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -35,7 +35,7 @@ #include "nsContentUtils.h" #include "nsGlobalWindow.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "IDBEvents.h" #include "IDBFactory.h" diff --git a/dom/indexedDB/ProfilerHelpers.h b/dom/indexedDB/ProfilerHelpers.h index 9319891468da..2d3441822e4c 100644 --- a/dom/indexedDB/ProfilerHelpers.h +++ b/dom/indexedDB/ProfilerHelpers.h @@ -27,7 +27,7 @@ #include "nsID.h" #include "nsIDOMEvent.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" // Include this last to avoid path problems on Windows. #include "ActorsChild.h" diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp index f1d3d2dde4ec..7874d115f9aa 100644 --- a/dom/ipc/ProcessPriorityManager.cpp +++ b/dom/ipc/ProcessPriorityManager.cpp @@ -15,7 +15,7 @@ #include "mozilla/Services.h" #include "mozilla/unused.h" #include "AudioChannelService.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsPrintfCString.h" #include "nsXULAppAPI.h" #include "nsIFrameLoader.h" diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp index 665b7d1a1f53..3833fcf1bafa 100644 --- a/dom/media/AudioStream.cpp +++ b/dom/media/AudioStream.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "prdtoa.h" #include "AudioStream.h" #include "VideoUtils.h" diff --git a/dom/media/Latency.cpp b/dom/media/Latency.cpp index 5fa0bb4eaf1b..94367a5d7e8e 100644 --- a/dom/media/Latency.cpp +++ b/dom/media/Latency.cpp @@ -6,7 +6,7 @@ #include "Latency.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include #include diff --git a/dom/media/Latency.h b/dom/media/Latency.h index 56645da7dafe..e7a83d78b8cf 100644 --- a/dom/media/Latency.h +++ b/dom/media/Latency.h @@ -8,7 +8,7 @@ #define MOZILLA_LATENCY_H #include "mozilla/TimeStamp.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsCOMPtr.h" #include "nsIThread.h" #include "mozilla/Monitor.h" diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp index 5b563e33b539..4d2ca1e446f6 100644 --- a/dom/media/MediaCache.cpp +++ b/dom/media/MediaCache.cpp @@ -11,7 +11,7 @@ #include "nsContentUtils.h" #include "nsThreadUtils.h" #include "MediaResource.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Preferences.h" #include "FileBlockCache.h" #include "nsAnonymousTemporaryFile.h" diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h index 271b5e32f101..5b93ebe26f5e 100644 --- a/dom/media/MediaManager.h +++ b/dom/media/MediaManager.h @@ -27,7 +27,7 @@ #include "mozilla/dom/MediaStreamBinding.h" #include "mozilla/dom/MediaStreamTrackBinding.h" #include "mozilla/dom/MediaStreamError.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "DOMMediaStream.h" #ifdef MOZ_WEBRTC diff --git a/dom/media/MediaPromise.h b/dom/media/MediaPromise.h index d5abe8a78734..b0dc1f410a79 100644 --- a/dom/media/MediaPromise.h +++ b/dom/media/MediaPromise.h @@ -7,7 +7,7 @@ #if !defined(MediaPromise_h_) #define MediaPromise_h_ -#include "prlog.h" +#include "mozilla/Logging.h" #include "AbstractThread.h" diff --git a/dom/media/MediaShutdownManager.cpp b/dom/media/MediaShutdownManager.cpp index a447258bbe46..4e55ba0365c4 100644 --- a/dom/media/MediaShutdownManager.cpp +++ b/dom/media/MediaShutdownManager.cpp @@ -9,7 +9,7 @@ #include "mozilla/StaticPtr.h" #include "MediaDecoder.h" #include "SharedThreadPool.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp index 060dd2fd9d95..faa0a882e8cd 100644 --- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -16,7 +16,7 @@ #include "nsServiceManagerUtils.h" #include "nsWidgetsCID.h" #include "prerror.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Attributes.h" #include "TrackUnionStream.h" #include "ImageContainer.h" diff --git a/dom/media/StateMirroring.h b/dom/media/StateMirroring.h index 1191ebc48b3d..0b7573fd1e80 100644 --- a/dom/media/StateMirroring.h +++ b/dom/media/StateMirroring.h @@ -16,7 +16,7 @@ #include "mozilla/UniquePtr.h" #include "mozilla/unused.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsISupportsImpl.h" /* diff --git a/dom/media/StreamBuffer.cpp b/dom/media/StreamBuffer.cpp index 4fa25428565a..6676a4f94ffd 100644 --- a/dom/media/StreamBuffer.cpp +++ b/dom/media/StreamBuffer.cpp @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "StreamBuffer.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include namespace mozilla { diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp index 2ba5c32dbd59..eb995571dac2 100644 --- a/dom/media/TrackUnionStream.cpp +++ b/dom/media/TrackUnionStream.cpp @@ -16,7 +16,7 @@ #include "nsServiceManagerUtils.h" #include "nsWidgetsCID.h" #include "prerror.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Attributes.h" #include "TrackUnionStream.h" #include "ImageContainer.h" diff --git a/dom/media/directshow/AudioSinkFilter.cpp b/dom/media/directshow/AudioSinkFilter.cpp index 3701a280a502..861b2606cc12 100644 --- a/dom/media/directshow/AudioSinkFilter.cpp +++ b/dom/media/directshow/AudioSinkFilter.cpp @@ -8,7 +8,7 @@ #include "AudioSinkFilter.h" #include "AudioSinkInputPin.h" #include "VideoUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include diff --git a/dom/media/directshow/AudioSinkInputPin.cpp b/dom/media/directshow/AudioSinkInputPin.cpp index bc6687bf1d41..b19c1785d2cc 100644 --- a/dom/media/directshow/AudioSinkInputPin.cpp +++ b/dom/media/directshow/AudioSinkInputPin.cpp @@ -7,7 +7,7 @@ #include "AudioSinkInputPin.h" #include "AudioSinkFilter.h" #include "SampleSink.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include diff --git a/dom/media/directshow/DirectShowUtils.h b/dom/media/directshow/DirectShowUtils.h index 8ff97df613e6..d54b43cec52e 100644 --- a/dom/media/directshow/DirectShowUtils.h +++ b/dom/media/directshow/DirectShowUtils.h @@ -17,7 +17,7 @@ #undef GetPrevSibling #include "DShowTools.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/dom/media/directshow/SampleSink.cpp b/dom/media/directshow/SampleSink.cpp index 30a36f6de798..56f39657763c 100644 --- a/dom/media/directshow/SampleSink.cpp +++ b/dom/media/directshow/SampleSink.cpp @@ -8,7 +8,7 @@ #include "AudioSinkFilter.h" #include "AudioSinkInputPin.h" #include "VideoUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla::media; diff --git a/dom/media/directshow/SourceFilter.cpp b/dom/media/directshow/SourceFilter.cpp index 7018e3822d65..9cfaab4e4078 100644 --- a/dom/media/directshow/SourceFilter.cpp +++ b/dom/media/directshow/SourceFilter.cpp @@ -9,7 +9,7 @@ #include "mozilla/RefPtr.h" #include "DirectShowUtils.h" #include "MP3FrameParser.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include using namespace mozilla::media; diff --git a/dom/media/eme/EMEUtils.h b/dom/media/eme/EMEUtils.h index 43983c8bcc10..e96d89382e3d 100644 --- a/dom/media/eme/EMEUtils.h +++ b/dom/media/eme/EMEUtils.h @@ -7,7 +7,7 @@ #ifndef EME_LOG_H_ #define EME_LOG_H_ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsString.h" namespace mozilla { diff --git a/dom/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp index c978f3b4e674..475983a3c3bc 100644 --- a/dom/media/encoder/MediaEncoder.cpp +++ b/dom/media/encoder/MediaEncoder.cpp @@ -6,7 +6,7 @@ #include "MediaDecoder.h" #include "nsIPrincipal.h" #include "nsMimeTypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Preferences.h" #include "mozilla/StaticPtr.h" diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp index 0e3eff89887e..2e19959e47f4 100644 --- a/dom/media/encoder/TrackEncoder.cpp +++ b/dom/media/encoder/TrackEncoder.cpp @@ -5,7 +5,7 @@ #include "TrackEncoder.h" #include "AudioChannelFormat.h" #include "MediaStreamGraph.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "VideoUtils.h" #undef LOG diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp index d9c9aac4b5a9..16e8181b0513 100644 --- a/dom/media/fmp4/MP4Decoder.cpp +++ b/dom/media/fmp4/MP4Decoder.cpp @@ -14,7 +14,7 @@ #ifdef MOZ_EME #include "mozilla/CDMProxy.h" #endif -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef XP_WIN #include "mozilla/WindowsVersion.h" diff --git a/dom/media/gmp/GMPAudioDecoderParent.cpp b/dom/media/gmp/GMPAudioDecoderParent.cpp index 93825ad41aed..153086d43626 100644 --- a/dom/media/gmp/GMPAudioDecoderParent.cpp +++ b/dom/media/gmp/GMPAudioDecoderParent.cpp @@ -9,7 +9,7 @@ #include "mozilla/unused.h" #include "GMPMessageUtils.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/dom/media/gmp/GMPContentParent.cpp b/dom/media/gmp/GMPContentParent.cpp index ef8d38826ecd..f89b005aa62c 100644 --- a/dom/media/gmp/GMPContentParent.cpp +++ b/dom/media/gmp/GMPContentParent.cpp @@ -11,7 +11,7 @@ #include "GMPVideoDecoderParent.h" #include "GMPVideoEncoderParent.h" #include "mozIGeckoMediaPluginService.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp index e2f5faa3cc3b..c4bf580c416d 100644 --- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GMPParent.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h" #include "nsIInputStream.h" diff --git a/dom/media/gmp/GMPService.cpp b/dom/media/gmp/GMPService.cpp index d4273a201670..1fa5e349db04 100644 --- a/dom/media/gmp/GMPService.cpp +++ b/dom/media/gmp/GMPService.cpp @@ -6,7 +6,7 @@ #include "GMPServiceParent.h" #include "GMPServiceChild.h" #include "prio.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "GMPParent.h" #include "GMPVideoDecoderParent.h" #include "nsIObserverService.h" diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp index e8d056322d9f..f94c3b7572e9 100644 --- a/dom/media/gmp/GMPServiceParent.cpp +++ b/dom/media/gmp/GMPServiceParent.cpp @@ -5,7 +5,7 @@ #include "GMPService.h" #include "prio.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "GMPParent.h" #include "GMPVideoDecoderParent.h" #include "nsIObserverService.h" diff --git a/dom/media/gmp/GMPVideoDecoderParent.cpp b/dom/media/gmp/GMPVideoDecoderParent.cpp index 7de13a51a2d3..1b075be98bcf 100644 --- a/dom/media/gmp/GMPVideoDecoderParent.cpp +++ b/dom/media/gmp/GMPVideoDecoderParent.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GMPVideoDecoderParent.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/unused.h" #include "nsAutoRef.h" #include "nsThreadUtils.h" diff --git a/dom/media/gmp/GMPVideoEncoderParent.cpp b/dom/media/gmp/GMPVideoEncoderParent.cpp index d5f38872382a..4a1ff70e012f 100644 --- a/dom/media/gmp/GMPVideoEncoderParent.cpp +++ b/dom/media/gmp/GMPVideoEncoderParent.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GMPVideoEncoderParent.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "GMPVideoi420FrameImpl.h" #include "GMPVideoEncodedFrameImpl.h" #include "mozilla/unused.h" diff --git a/dom/media/imagecapture/ImageCapture.h b/dom/media/imagecapture/ImageCapture.h index 274b463d14b9..492a995e1fa0 100644 --- a/dom/media/imagecapture/ImageCapture.h +++ b/dom/media/imagecapture/ImageCapture.h @@ -9,7 +9,7 @@ #include "mozilla/DOMEventTargetHelper.h" #include "mozilla/dom/ImageCaptureBinding.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/dom/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp index 89f5d7312206..f9f2cbf77cd1 100644 --- a/dom/media/mediasource/ContainerParser.cpp +++ b/dom/media/mediasource/ContainerParser.cpp @@ -9,7 +9,7 @@ #include "WebMBufferedParser.h" #include "mozilla/Endian.h" #include "mp4_demuxer/MoofParser.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "MediaData.h" #ifdef MOZ_FMP4 #include "MP4Stream.h" diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp index b3d8d98222cc..38781a3a8aad 100644 --- a/dom/media/mediasource/MediaSource.cpp +++ b/dom/media/mediasource/MediaSource.cpp @@ -29,7 +29,7 @@ #include "nsPIDOMWindow.h" #include "nsString.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsServiceManagerUtils.h" #ifdef MOZ_WIDGET_ANDROID diff --git a/dom/media/mediasource/MediaSourceDecoder.cpp b/dom/media/mediasource/MediaSourceDecoder.cpp index 3c6f7e89f91e..4fc4c3d5a869 100644 --- a/dom/media/mediasource/MediaSourceDecoder.cpp +++ b/dom/media/mediasource/MediaSourceDecoder.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MediaSourceDecoder.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/dom/HTMLMediaElement.h" #include "MediaDecoderStateMachine.h" #include "MediaSource.h" diff --git a/dom/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp index dfec6ad00b00..863c813bdd72 100644 --- a/dom/media/mediasource/MediaSourceReader.cpp +++ b/dom/media/mediasource/MediaSourceReader.cpp @@ -6,7 +6,7 @@ #include "MediaSourceReader.h" #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "DecoderTraits.h" #include "MediaDecoderOwner.h" #include "MediaFormatReader.h" diff --git a/dom/media/mediasource/MediaSourceResource.h b/dom/media/mediasource/MediaSourceResource.h index b918c9ed7f8a..529e58de7217 100644 --- a/dom/media/mediasource/MediaSourceResource.h +++ b/dom/media/mediasource/MediaSourceResource.h @@ -9,7 +9,7 @@ #include "MediaResource.h" #include "mozilla/Monitor.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetMediaSourceLog(); diff --git a/dom/media/mediasource/MediaSourceUtils.cpp b/dom/media/mediasource/MediaSourceUtils.cpp index ec88728aba74..49cb39a185aa 100644 --- a/dom/media/mediasource/MediaSourceUtils.cpp +++ b/dom/media/mediasource/MediaSourceUtils.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MediaSourceUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsPrintfCString.h" namespace mozilla { diff --git a/dom/media/mediasource/ResourceQueue.cpp b/dom/media/mediasource/ResourceQueue.cpp index c560bf7d536d..a245ba7a85b7 100644 --- a/dom/media/mediasource/ResourceQueue.cpp +++ b/dom/media/mediasource/ResourceQueue.cpp @@ -6,7 +6,7 @@ #include "nsDeque.h" #include "MediaData.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetSourceBufferResourceLog(); diff --git a/dom/media/mediasource/SourceBuffer.cpp b/dom/media/mediasource/SourceBuffer.cpp index 9712665f5866..c24229e4b3be 100644 --- a/dom/media/mediasource/SourceBuffer.cpp +++ b/dom/media/mediasource/SourceBuffer.cpp @@ -19,7 +19,7 @@ #include "nsIEventTarget.h" #include "nsIRunnable.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include #include "TimeUnits.h" diff --git a/dom/media/mediasource/SourceBufferDecoder.cpp b/dom/media/mediasource/SourceBufferDecoder.cpp index 4fe056032c69..175fa265ee15 100644 --- a/dom/media/mediasource/SourceBufferDecoder.cpp +++ b/dom/media/mediasource/SourceBufferDecoder.cpp @@ -6,7 +6,7 @@ #include "MediaSourceUtils.h" #include "SourceBufferDecoder.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "AbstractMediaDecoder.h" #include "MediaDecoderReader.h" diff --git a/dom/media/mediasource/SourceBufferList.cpp b/dom/media/mediasource/SourceBufferList.cpp index 245cc0cc8c99..0b18a4f20cb5 100644 --- a/dom/media/mediasource/SourceBufferList.cpp +++ b/dom/media/mediasource/SourceBufferList.cpp @@ -14,7 +14,7 @@ #include "nsIRunnable.h" #include "nsString.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceAPILog(); diff --git a/dom/media/mediasource/SourceBufferResource.cpp b/dom/media/mediasource/SourceBufferResource.cpp index e2adbfa98a13..0af78bfafacb 100644 --- a/dom/media/mediasource/SourceBufferResource.cpp +++ b/dom/media/mediasource/SourceBufferResource.cpp @@ -10,7 +10,7 @@ #include "nsISeekableStream.h" #include "nsISupports.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "MediaData.h" PRLogModuleInfo* GetSourceBufferResourceLog() diff --git a/dom/media/mediasource/SourceBufferResource.h b/dom/media/mediasource/SourceBufferResource.h index 82ed60e31290..227c59f8226d 100644 --- a/dom/media/mediasource/SourceBufferResource.h +++ b/dom/media/mediasource/SourceBufferResource.h @@ -18,7 +18,7 @@ #include "nsString.h" #include "nsTArray.h" #include "nscore.h" -#include "prlog.h" +#include "mozilla/Logging.h" #define UNIMPLEMENTED() { /* Logging this is too spammy to do by default */ } diff --git a/dom/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp index 6df46bea5060..0689c4944332 100644 --- a/dom/media/mediasource/TrackBuffer.cpp +++ b/dom/media/mediasource/TrackBuffer.cpp @@ -20,7 +20,7 @@ #include "nsError.h" #include "nsIRunnable.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetMediaSourceLog(); diff --git a/dom/media/omx/I420ColorConverterHelper.cpp b/dom/media/omx/I420ColorConverterHelper.cpp index 08c3b58c530a..2ea6bef8cae6 100644 --- a/dom/media/omx/I420ColorConverterHelper.cpp +++ b/dom/media/omx/I420ColorConverterHelper.cpp @@ -8,7 +8,7 @@ #include -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo *gI420ColorConverterHelperLog; #define LOG(msg...) PR_LOG(gI420ColorConverterHelperLog, PR_LOG_WARNING, (msg)) diff --git a/dom/media/omx/OmxDecoder.cpp b/dom/media/omx/OmxDecoder.cpp index ef423f616d89..449dde1a1089 100644 --- a/dom/media/omx/OmxDecoder.cpp +++ b/dom/media/omx/OmxDecoder.cpp @@ -26,7 +26,7 @@ #include "mozilla/Monitor.h" #include "nsMimeTypes.h" #include "MPAPI.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "GonkNativeWindow.h" #include "GonkNativeWindowClient.h" diff --git a/dom/media/platforms/apple/AppleATDecoder.cpp b/dom/media/platforms/apple/AppleATDecoder.cpp index 1a2a086e3a23..d73f0a98d7a1 100644 --- a/dom/media/platforms/apple/AppleATDecoder.cpp +++ b/dom/media/platforms/apple/AppleATDecoder.cpp @@ -10,7 +10,7 @@ #include "mp4_demuxer/Adts.h" #include "MediaInfo.h" #include "AppleATDecoder.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetAppleMediaLog(); #define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) diff --git a/dom/media/platforms/apple/AppleDecoderModule.cpp b/dom/media/platforms/apple/AppleDecoderModule.cpp index cece61878cc8..f01b6461d3ee 100644 --- a/dom/media/platforms/apple/AppleDecoderModule.cpp +++ b/dom/media/platforms/apple/AppleDecoderModule.cpp @@ -13,7 +13,7 @@ #include "AppleVTLinker.h" #include "mozilla/Preferences.h" #include "mozilla/DebugOnly.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetAppleMediaLog() { static PRLogModuleInfo* log = nullptr; diff --git a/dom/media/platforms/apple/AppleVDADecoder.cpp b/dom/media/platforms/apple/AppleVDADecoder.cpp index b704fa43b969..50902c378fb5 100644 --- a/dom/media/platforms/apple/AppleVDADecoder.cpp +++ b/dom/media/platforms/apple/AppleVDADecoder.cpp @@ -18,7 +18,7 @@ #include "nsAutoPtr.h" #include "nsCocoaFeatures.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "VideoUtils.h" #include #include "gfxPlatform.h" diff --git a/dom/media/platforms/apple/AppleVTDecoder.cpp b/dom/media/platforms/apple/AppleVTDecoder.cpp index 65d49211d495..e0aac426738b 100644 --- a/dom/media/platforms/apple/AppleVTDecoder.cpp +++ b/dom/media/platforms/apple/AppleVTDecoder.cpp @@ -16,7 +16,7 @@ #include "mozilla/ArrayUtils.h" #include "nsAutoPtr.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "VideoUtils.h" #include "gfxPlatform.h" diff --git a/dom/media/platforms/ffmpeg/FFmpegLog.cpp b/dom/media/platforms/ffmpeg/FFmpegLog.cpp index 6053a53f1347..1686be843308 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLog.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegLog.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetFFmpegDecoderLog() { diff --git a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp index 1ec8bae7cdf3..8fab94b1f133 100644 --- a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp +++ b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp @@ -12,7 +12,7 @@ #include "mp4_demuxer/Adts.h" #include "VideoUtils.h" #include "nsTArray.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "stagefright/MediaBuffer.h" #include "stagefright/MetaData.h" #include "stagefright/MediaErrors.h" diff --git a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp index cb73beb1daa7..ce8bd95300ea 100644 --- a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp +++ b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp @@ -9,7 +9,7 @@ #include "MediaCodecProxy.h" #include "MediaData.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include #define GMDD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkMediaDataDecoder", __VA_ARGS__) diff --git a/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp b/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp index 3ce99549ee75..5bfcd2edfa43 100644 --- a/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp +++ b/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp @@ -13,7 +13,7 @@ #include "VideoUtils.h" #include "nsThreadUtils.h" #include "Layers.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "stagefright/MediaBuffer.h" #include "stagefright/MetaData.h" #include "stagefright/MediaErrors.h" diff --git a/dom/media/platforms/wmf/MFTDecoder.cpp b/dom/media/platforms/wmf/MFTDecoder.cpp index f6f60910e6b3..f662bc99295e 100644 --- a/dom/media/platforms/wmf/MFTDecoder.cpp +++ b/dom/media/platforms/wmf/MFTDecoder.cpp @@ -7,7 +7,7 @@ #include "MFTDecoder.h" #include "nsThreadUtils.h" #include "WMFUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetDemuxerLog(); #define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) diff --git a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp index 2ea49cf22c20..a03c78e0415c 100644 --- a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp @@ -10,7 +10,7 @@ #include "WMFUtils.h" #include "nsTArray.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetDemuxerLog(); #define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) diff --git a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp index 32c9785fdca4..0ef7dd0ed0d6 100644 --- a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp +++ b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp @@ -10,7 +10,7 @@ #include "nsTArray.h" #include "mozilla/Telemetry.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* GetDemuxerLog(); #define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp index e5e8393c6779..cae0c36d87c2 100644 --- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp @@ -15,7 +15,7 @@ #include "Layers.h" #include "mozilla/layers/LayersTypes.h" #include "MediaInfo.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "gfx2DGlue.h" #include "gfxWindowsPlatform.h" #include "IMFYCbCrImage.h" diff --git a/dom/media/systemservices/LoadManager.cpp b/dom/media/systemservices/LoadManager.cpp index acf336848f96..636ed9658815 100644 --- a/dom/media/systemservices/LoadManager.cpp +++ b/dom/media/systemservices/LoadManager.cpp @@ -6,7 +6,7 @@ #include "LoadManager.h" #include "LoadMonitor.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "prinrval.h" #include "prsystem.h" diff --git a/dom/media/systemservices/LoadMonitor.cpp b/dom/media/systemservices/LoadMonitor.cpp index 97becfef8179..f9fb724093f4 100644 --- a/dom/media/systemservices/LoadMonitor.cpp +++ b/dom/media/systemservices/LoadMonitor.cpp @@ -6,7 +6,7 @@ #include "LoadMonitor.h" #include "LoadManager.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "prinrval.h" #include "prsystem.h" diff --git a/dom/media/systemservices/MediaChild.cpp b/dom/media/systemservices/MediaChild.cpp index 9b06a602be38..3e38d5677448 100644 --- a/dom/media/systemservices/MediaChild.cpp +++ b/dom/media/systemservices/MediaChild.cpp @@ -10,7 +10,7 @@ #include "mozilla/ipc/PBackgroundChild.h" #include "nsGlobalWindow.h" #include "mozilla/MediaManager.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsQueryObject.h" #undef LOG diff --git a/dom/media/systemservices/MediaParent.cpp b/dom/media/systemservices/MediaParent.cpp index 5239233afb28..8fd22b3f7904 100644 --- a/dom/media/systemservices/MediaParent.cpp +++ b/dom/media/systemservices/MediaParent.cpp @@ -17,7 +17,7 @@ #include "nsILineInputStream.h" #include "nsAppDirectoryServiceDefs.h" #include "nsISupportsImpl.h" -#include "prlog.h" +#include "mozilla/Logging.h" #undef LOG PRLogModuleInfo *gMediaParentLog; diff --git a/dom/media/systemservices/OpenSLESProvider.cpp b/dom/media/systemservices/OpenSLESProvider.cpp index 8f6ad459a3fb..e18e95abfbcb 100644 --- a/dom/media/systemservices/OpenSLESProvider.cpp +++ b/dom/media/systemservices/OpenSLESProvider.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "OpenSLESProvider.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsDebug.h" #include diff --git a/dom/media/webspeech/synth/SpeechSynthesis.cpp b/dom/media/webspeech/synth/SpeechSynthesis.cpp index f6a612d737cc..0874dd59de98 100644 --- a/dom/media/webspeech/synth/SpeechSynthesis.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesis.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsSpeechTask.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/Element.h" diff --git a/dom/media/wmf/WMFUtils.cpp b/dom/media/wmf/WMFUtils.cpp index 82d58ad660f7..c415f2ee9e5a 100644 --- a/dom/media/wmf/WMFUtils.cpp +++ b/dom/media/wmf/WMFUtils.cpp @@ -9,7 +9,7 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/RefPtr.h" #include "mozilla/WindowsVersion.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsThreadUtils.h" #include "nsWindowsHelpers.h" #include "mozilla/CheckedInt.h" diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp index c421c480acfe..be2b0d865afd 100644 --- a/dom/plugins/base/nsNPAPIPluginInstance.cpp +++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp @@ -10,7 +10,7 @@ #include "base/basictypes.h" #endif -#include "prlog.h" +#include "mozilla/Logging.h" #include "prmem.h" #include "nscore.h" #include "prenv.h" diff --git a/dom/plugins/base/nsPluginLogging.h b/dom/plugins/base/nsPluginLogging.h index 6673a113c262..6f4f7a04b042 100644 --- a/dom/plugins/base/nsPluginLogging.h +++ b/dom/plugins/base/nsPluginLogging.h @@ -8,7 +8,7 @@ #ifndef nsPluginLogging_h__ #define nsPluginLogging_h__ -#include "prlog.h" +#include "mozilla/Logging.h" #ifndef PLUGIN_LOGGING // allow external override #define PLUGIN_LOGGING 1 // master compile-time switch for pluging logging diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h index ce24815b029f..722cef14b6e5 100644 --- a/dom/plugins/ipc/PluginMessageUtils.h +++ b/dom/plugins/ipc/PluginMessageUtils.h @@ -20,7 +20,7 @@ #include "nsAutoPtr.h" #include "nsString.h" #include "nsTArray.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsHashKeys.h" #ifdef MOZ_CRASHREPORTER # include "nsExceptionHandler.h" diff --git a/dom/security/nsCSPContext.cpp b/dom/security/nsCSPContext.cpp index d15c20027126..4319f710e885 100644 --- a/dom/security/nsCSPContext.cpp +++ b/dom/security/nsCSPContext.cpp @@ -35,7 +35,7 @@ #include "nsSupportsPrimitives.h" #include "nsThreadUtils.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/dom/CSPReportBinding.h" #include "mozilla/net/ReferrerPolicy.h" #include "nsINetworkInterceptController.h" diff --git a/dom/security/nsCSPService.cpp b/dom/security/nsCSPService.cpp index 9bdcda6bda79..bb1d9f235c8c 100644 --- a/dom/security/nsCSPService.cpp +++ b/dom/security/nsCSPService.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsString.h" #include "nsCOMPtr.h" #include "nsIURI.h" diff --git a/dom/security/nsCSPUtils.h b/dom/security/nsCSPUtils.h index 8248afb1a8f6..e1e3ddb09e4e 100644 --- a/dom/security/nsCSPUtils.h +++ b/dom/security/nsCSPUtils.h @@ -14,7 +14,7 @@ #include "nsString.h" #include "nsTArray.h" #include "nsUnicharUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" /* =============== Logging =================== */ diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp index e1d175c88352..4dcaf68d397d 100644 --- a/dom/security/nsMixedContentBlocker.cpp +++ b/dom/security/nsMixedContentBlocker.cpp @@ -33,7 +33,7 @@ #include "nsAsyncRedirectVerifyHelper.h" #include "mozilla/LoadInfo.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/dom/xml/nsXMLContentSink.cpp b/dom/xml/nsXMLContentSink.cpp index d72df453a6c1..e325f8f6faa1 100644 --- a/dom/xml/nsXMLContentSink.cpp +++ b/dom/xml/nsXMLContentSink.cpp @@ -30,7 +30,7 @@ #include "nsIScriptSecurityManager.h" #include "nsIContentViewer.h" #include "prtime.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prmem.h" #include "nsRect.h" #include "nsIWebNavigation.h" diff --git a/dom/xslt/base/txLog.h b/dom/xslt/base/txLog.h index 76fc103c29a0..16d9decdcaef 100644 --- a/dom/xslt/base/txLog.h +++ b/dom/xslt/base/txLog.h @@ -6,7 +6,7 @@ #ifndef txLog_h__ #define txLog_h__ -#include "prlog.h" +#include "mozilla/Logging.h" class txLog { diff --git a/dom/xul/XULDocument.cpp b/dom/xul/XULDocument.cpp index 850249a47620..fbf10967844c 100644 --- a/dom/xul/XULDocument.cpp +++ b/dom/xul/XULDocument.cpp @@ -50,7 +50,7 @@ #include "nsPIWindowRoot.h" #include "nsXULCommandDispatcher.h" #include "nsXULElement.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "nsIFrame.h" #include "nsXBLService.h" diff --git a/dom/xul/nsXULCommandDispatcher.cpp b/dom/xul/nsXULCommandDispatcher.cpp index 7de911acf219..a29fb840a47c 100644 --- a/dom/xul/nsXULCommandDispatcher.cpp +++ b/dom/xul/nsXULCommandDispatcher.cpp @@ -25,7 +25,7 @@ #include "nsPIWindowRoot.h" #include "nsRDFCID.h" #include "nsXULCommandDispatcher.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsContentUtils.h" #include "nsReadableUtils.h" #include "nsCRT.h" diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp index 8b047a080126..0208ffd8d744 100644 --- a/dom/xul/nsXULContentSink.cpp +++ b/dom/xul/nsXULContentSink.cpp @@ -41,7 +41,7 @@ #include "nsXPIDLString.h" #include "nsReadableUtils.h" #include "nsXULElement.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prmem.h" #include "nsCRT.h" diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp index e57ed3c66a8b..54536f7cd31d 100644 --- a/dom/xul/nsXULElement.cpp +++ b/dom/xul/nsXULElement.cpp @@ -87,7 +87,7 @@ #include "nsXULContentUtils.h" #include "nsNodeUtils.h" #include "nsFrameLoader.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "nsIControllers.h" #include "nsAttrValueOrString.h" diff --git a/dom/xul/templates/nsContentTestNode.cpp b/dom/xul/templates/nsContentTestNode.cpp index 48dd05b4361f..1609f62492a6 100644 --- a/dom/xul/templates/nsContentTestNode.cpp +++ b/dom/xul/templates/nsContentTestNode.cpp @@ -12,7 +12,7 @@ #include "nsIXULTemplateBuilder.h" #include "nsXULTemplateQueryProcessorRDF.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; nsContentTestNode::nsContentTestNode(nsXULTemplateQueryProcessorRDF* aProcessor, diff --git a/dom/xul/templates/nsInstantiationNode.cpp b/dom/xul/templates/nsInstantiationNode.cpp index d8ece24b8ada..cac5d18f7e16 100644 --- a/dom/xul/templates/nsInstantiationNode.cpp +++ b/dom/xul/templates/nsInstantiationNode.cpp @@ -7,7 +7,7 @@ #include "nsTemplateRule.h" #include "nsXULTemplateQueryProcessorRDF.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor, diff --git a/dom/xul/templates/nsRDFConInstanceTestNode.cpp b/dom/xul/templates/nsRDFConInstanceTestNode.cpp index 1a1a6b4349e1..c8f1eb1e0f41 100644 --- a/dom/xul/templates/nsRDFConInstanceTestNode.cpp +++ b/dom/xul/templates/nsRDFConInstanceTestNode.cpp @@ -11,7 +11,7 @@ #include "nsRDFConInstanceTestNode.h" #include "nsResourceSet.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsXULContentUtils.h" extern PRLogModuleInfo* gXULTemplateLog; diff --git a/dom/xul/templates/nsRDFConMemberTestNode.cpp b/dom/xul/templates/nsRDFConMemberTestNode.cpp index 87c54d6a9bb8..a2f074449ee5 100644 --- a/dom/xul/templates/nsRDFConMemberTestNode.cpp +++ b/dom/xul/templates/nsRDFConMemberTestNode.cpp @@ -12,7 +12,7 @@ #include "nsString.h" #include "nsXULContentUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; nsRDFConMemberTestNode::nsRDFConMemberTestNode(TestNode* aParent, diff --git a/dom/xul/templates/nsRDFPropertyTestNode.cpp b/dom/xul/templates/nsRDFPropertyTestNode.cpp index 186cdd759ab0..3a68afb462b9 100644 --- a/dom/xul/templates/nsRDFPropertyTestNode.cpp +++ b/dom/xul/templates/nsRDFPropertyTestNode.cpp @@ -7,7 +7,7 @@ #include "nsString.h" #include "nsXULContentUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; #include "nsIRDFLiteral.h" diff --git a/dom/xul/templates/nsRuleNetwork.cpp b/dom/xul/templates/nsRuleNetwork.cpp index 735edfd4ec7f..80331026d3f0 100644 --- a/dom/xul/templates/nsRuleNetwork.cpp +++ b/dom/xul/templates/nsRuleNetwork.cpp @@ -20,7 +20,7 @@ #include "nsCOMPtr.h" #include "plhash.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; #include "nsString.h" diff --git a/dom/xul/templates/nsXULContentUtils.cpp b/dom/xul/templates/nsXULContentUtils.cpp index d9fd5d21de37..415397ed1223 100644 --- a/dom/xul/templates/nsXULContentUtils.cpp +++ b/dom/xul/templates/nsXULContentUtils.cpp @@ -45,7 +45,7 @@ #include "nsString.h" #include "nsXPIDLString.h" #include "nsGkAtoms.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "rdf.h" #include "nsContentUtils.h" diff --git a/dom/xul/templates/nsXULTemplateBuilder.cpp b/dom/xul/templates/nsXULTemplateBuilder.cpp index fd77e67ba6a7..cf3cd0cc7fa3 100644 --- a/dom/xul/templates/nsXULTemplateBuilder.cpp +++ b/dom/xul/templates/nsXULTemplateBuilder.cpp @@ -55,7 +55,7 @@ #include "nsGkAtoms.h" #include "nsXULElement.h" #include "jsapi.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "pldhash.h" #include "plhash.h" diff --git a/dom/xul/templates/nsXULTemplateBuilder.h b/dom/xul/templates/nsXULTemplateBuilder.h index 7eead461b934..8a2eb05bb2ee 100644 --- a/dom/xul/templates/nsXULTemplateBuilder.h +++ b/dom/xul/templates/nsXULTemplateBuilder.h @@ -25,7 +25,7 @@ #include "nsIXULTemplateQueryProcessor.h" #include "nsCycleCollectionParticipant.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; class nsIContent; diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h index edb422944ad8..535d27db817c 100644 --- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h +++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h @@ -28,7 +28,7 @@ #include "nsCycleCollectionParticipant.h" #include "mozilla/Attributes.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gXULTemplateLog; class nsIContent; diff --git a/extensions/auth/nsAuth.h b/extensions/auth/nsAuth.h index 2ad72d12b047..1d60de84c9aa 100644 --- a/extensions/auth/nsAuth.h +++ b/extensions/auth/nsAuth.h @@ -12,7 +12,7 @@ enum pType { PACKAGE_TYPE_NTLM }; -#include "prlog.h" +#include "mozilla/Logging.h" // // in order to do logging, the following environment variables need to be set: diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 7bd582b1a860..cd1eacf53bb0 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -33,7 +33,7 @@ #include "plbase64.h" #include "plstr.h" #include "prprf.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prmem.h" #include "prnetdb.h" #include "mozilla/Likely.h" diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h index 7fb6cbc0d907..f6d6155a6490 100644 --- a/gfx/2d/Logging.h +++ b/gfx/2d/Logging.h @@ -12,7 +12,7 @@ #include #ifdef MOZ_LOGGING -#include +#include "mozilla/Logging.h" #endif #if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID) diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index 4ce0bb5a39be..84ca4b0c6318 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -44,7 +44,7 @@ #include "nsTArray.h" // for nsTArray #include "nsTArrayForwardDeclare.h" // for InfallibleTArray #include "nscore.h" // for nsACString, nsAString -#include "prlog.h" // for PRLogModuleInfo +#include "mozilla/Logging.h" // for PRLogModuleInfo #include "nsIWidget.h" // For plugin window configuration information structs #include "gfxVR.h" diff --git a/gfx/layers/LayersTypes.h b/gfx/layers/LayersTypes.h index 93802b85e086..0642812273b9 100644 --- a/gfx/layers/LayersTypes.h +++ b/gfx/layers/LayersTypes.h @@ -16,7 +16,7 @@ #include #endif #include // FILE -#include "prlog.h" // for PR_LOG +#include "mozilla/Logging.h" // for PR_LOG #ifndef MOZ_LAYERS_HAVE_LOG # define MOZ_LAYERS_HAVE_LOG #endif diff --git a/gfx/thebes/gfxFT2Fonts.cpp b/gfx/thebes/gfxFT2Fonts.cpp index 26ae52e9efcb..6fa799ec045d 100644 --- a/gfx/thebes/gfxFT2Fonts.cpp +++ b/gfx/thebes/gfxFT2Fonts.cpp @@ -31,7 +31,7 @@ #include "nsCRT.h" #include "nsXULAppAPI.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prinit.h" #include "mozilla/MemoryReporting.h" diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 645dd6a09a5f..e590bfe1276d 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "gfxFcPlatformFontList.h" #include "gfxFont.h" diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index 653a01e7ed15..df85ab905eb7 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/gfx/thebes/gfxFont.cpp @@ -10,7 +10,7 @@ #include "mozilla/gfx/2D.h" #include "mozilla/MathAlgorithms.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsExpirationTracker.h" #include "nsITimer.h" diff --git a/gfx/thebes/gfxFontEntry.cpp b/gfx/thebes/gfxFontEntry.cpp index 52bd23b98ae0..0bc9521dac7c 100644 --- a/gfx/thebes/gfxFontEntry.cpp +++ b/gfx/thebes/gfxFontEntry.cpp @@ -6,7 +6,7 @@ #include "mozilla/DebugOnly.h" #include "mozilla/MathAlgorithms.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsServiceManagerUtils.h" #include "nsExpirationTracker.h" diff --git a/gfx/thebes/gfxFontUtils.cpp b/gfx/thebes/gfxFontUtils.cpp index fe609d890dbb..cbc884ee8858 100644 --- a/gfx/thebes/gfxFontUtils.cpp +++ b/gfx/thebes/gfxFontUtils.cpp @@ -23,7 +23,7 @@ #include "harfbuzz/hb.h" #include "plbase64.h" -#include "prlog.h" +#include "mozilla/Logging.h" #define LOG(log, args) PR_LOG(gfxPlatform::GetLog(log), \ PR_LOG_DEBUG, args) diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp index 5d6caea3e48a..fa75865dd644 100644 --- a/gfx/thebes/gfxGDIFontList.cpp +++ b/gfx/thebes/gfxGDIFontList.cpp @@ -6,7 +6,7 @@ #include "mozilla/DebugOnly.h" #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "gfxGDIFontList.h" #include "gfxWindowsPlatform.h" diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm index 9a21e5e72518..a9bce6e49142 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -38,7 +38,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "prlog.h" +#include "mozilla/Logging.h" #include diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 10fe98fcbf1e..f282187ffcb0 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -10,7 +10,7 @@ #include "mozilla/layers/SharedBufferManagerChild.h" #include "mozilla/layers/ISurfaceAllocator.h" // for GfxMemoryImageReporter -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "gfxPlatform.h" diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index 6e262c9f62c1..977b7eead63a 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -6,7 +6,7 @@ #ifndef GFX_PLATFORM_H #define GFX_PLATFORM_H -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/gfx/Types.h" #include "nsTArray.h" #include "nsString.h" diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index 4e694ad604f4..f48bc7a952eb 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "gfxPlatformFontList.h" #include "gfxTextRun.h" diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp index 547b1e4590fa..e4383e0c4a9e 100644 --- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "gfxUserFontSet.h" #include "gfxPlatform.h" diff --git a/hal/HalLog.h b/hal/HalLog.h index 9910d296bf7d..4000a4e2123b 100644 --- a/hal/HalLog.h +++ b/hal/HalLog.h @@ -7,7 +7,7 @@ #ifndef mozilla_HalLog_h #define mozilla_HalLog_h -#include "prlog.h" +#include "mozilla/Logging.h" /* * HalLog.h contains internal macros and functions used for logging. diff --git a/image/ImageLogging.h b/image/ImageLogging.h index 9186d43e13bf..ef3c7d893fd5 100644 --- a/image/ImageLogging.h +++ b/image/ImageLogging.h @@ -7,7 +7,7 @@ #ifndef mozilla_image_ImageLogging_h #define mozilla_image_ImageLogging_h -#include "prlog.h" +#include "mozilla/Logging.h" #include "prinrval.h" #include "nsString.h" diff --git a/ipc/chromium/src/base/logging.h b/ipc/chromium/src/base/logging.h index e36dce93ee2d..5a9c16655eed 100644 --- a/ipc/chromium/src/base/logging.h +++ b/ipc/chromium/src/base/logging.h @@ -9,7 +9,7 @@ #include #include "base/basictypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef NO_CHROMIUM_LOGGING #include diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index b1c59be48f37..3ce8fee7a291 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -8,7 +8,7 @@ #include -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef ANDROID #include #endif diff --git a/js/xpconnect/src/XPCLog.cpp b/js/xpconnect/src/XPCLog.cpp index 6ca069a9cf99..afbfe4c218d1 100644 --- a/js/xpconnect/src/XPCLog.cpp +++ b/js/xpconnect/src/XPCLog.cpp @@ -7,7 +7,7 @@ /* Debug Logging support. */ #include "XPCLog.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "mozilla/mozalloc.h" #include diff --git a/js/xpconnect/src/XPCLog.h b/js/xpconnect/src/XPCLog.h index 324fc465f568..9251c82ed9fb 100644 --- a/js/xpconnect/src/XPCLog.h +++ b/js/xpconnect/src/XPCLog.h @@ -9,7 +9,7 @@ #ifndef xpclog_h___ #define xpclog_h___ -#include "prlog.h" +#include "mozilla/Logging.h" /* * This uses prlog.h See prlog.h for environment settings for output. diff --git a/layout/base/AccessibleCaretLogger.h b/layout/base/AccessibleCaretLogger.h index fff600243457..bbb9eb167b2f 100644 --- a/layout/base/AccessibleCaretLogger.h +++ b/layout/base/AccessibleCaretLogger.h @@ -7,7 +7,7 @@ #ifndef AccessibleCaretLog_h #define AccessibleCaretLog_h -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/layout/base/SelectionCarets.cpp b/layout/base/SelectionCarets.cpp index 1209a903193f..db5abb9b0437 100644 --- a/layout/base/SelectionCarets.cpp +++ b/layout/base/SelectionCarets.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "SelectionCarets.h" #include "gfxPrefs.h" diff --git a/layout/base/TouchCaret.cpp b/layout/base/TouchCaret.cpp index 03c4c861cdfa..eaf892d7a45a 100644 --- a/layout/base/TouchCaret.cpp +++ b/layout/base/TouchCaret.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "TouchCaret.h" #include diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 6d6d65d0da4d..e0854fee67fe 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -131,7 +131,7 @@ using namespace mozilla::dom; //----------------------------------------------------- // PR LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef NS_PRINTING static PRLogModuleInfo * diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index f1542d023728..97e98d81ff50 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -18,7 +18,7 @@ /* a presentation of a document, part 2 */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/ArrayUtils.h" #include "mozilla/CSSStyleSheet.h" diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp index b605453381e5..564e288a32ad 100644 --- a/layout/base/nsRefreshDriver.cpp +++ b/layout/base/nsRefreshDriver.cpp @@ -33,7 +33,7 @@ #include "nsLayoutUtils.h" #include "nsPresContext.h" #include "nsComponentManagerUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsAutoPtr.h" #include "nsIDocument.h" #include "jsapi.h" diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 2a5571ef8389..0fd0b5ed3140 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -17,7 +17,7 @@ #include "nsPresContext.h" #include "nsRenderingContext.h" #include "nsStyleContext.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include #include "mozilla/LinkedList.h" #include "mozilla/FloatingPoint.h" diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 7e57a9189751..03d7ad672372 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -34,7 +34,7 @@ #include "nsPresContext.h" #include "nsStyleConsts.h" #include "nsIPresShell.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "nsFrameManager.h" #include "nsLayoutUtils.h" diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index c171a9bb3016..f40ebf84c858 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -12,7 +12,7 @@ #include "mozilla/EventForwards.h" #include "mozilla/Likely.h" #include "nsBox.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIPresShell.h" #include "nsHTMLReflowState.h" diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 609e073f27a5..5e2c287edf03 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -21,7 +21,7 @@ #include "nsBidiUtils.h" #include "nsIPrintSettings.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo *GetLayoutPrintingLog(); #define PR_PL(_p1) PR_LOG(GetLayoutPrintingLog(), PR_LOG_DEBUG, _p1) diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp index 4576eabba356..5ced4a006d10 100644 --- a/layout/generic/nsPluginFrame.cpp +++ b/layout/generic/nsPluginFrame.cpp @@ -65,7 +65,7 @@ #ifdef MOZ_LOGGING #define FORCE_PR_LOG 1 /* Allow logging in the release build */ #endif /* MOZ_LOGGING */ -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef XP_MACOSX #include "gfxQuartzNativeDrawing.h" diff --git a/layout/generic/nsSimplePageSequenceFrame.cpp b/layout/generic/nsSimplePageSequenceFrame.cpp index d63fcbe27ef1..48e39c04afae 100644 --- a/layout/generic/nsSimplePageSequenceFrame.cpp +++ b/layout/generic/nsSimplePageSequenceFrame.cpp @@ -41,7 +41,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-se // -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo * GetLayoutPrintingLog() { diff --git a/layout/printing/nsPrintData.cpp b/layout/printing/nsPrintData.cpp index 66e3c6fe9f1b..b7ac4cb52688 100644 --- a/layout/printing/nsPrintData.cpp +++ b/layout/printing/nsPrintData.cpp @@ -14,7 +14,7 @@ //----------------------------------------------------- // PR LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #define DUMP_LAYOUT_LEVEL 9 // this turns on the dumping of each doucment's layout info static PRLogModuleInfo * diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp index 94efa2bd7fcd..2baa43151e50 100644 --- a/layout/printing/nsPrintEngine.cpp +++ b/layout/printing/nsPrintEngine.cpp @@ -127,7 +127,7 @@ using namespace mozilla::dom; //----------------------------------------------------- // PR LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #ifdef DEBUG // PR_LOGGING is force to always be on (even in release builds) diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp index 30326364b8c9..0dcc5a3fb978 100644 --- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -6,7 +6,7 @@ #include "FontFaceSet.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/css/Loader.h" #include "mozilla/dom/CSSFontFaceLoadEvent.h" diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp index c5b58a212a71..752c49fdd385 100644 --- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -253,7 +253,7 @@ private: void FireLoadEvent(nsIThreadInternal* aThread); }; -#include "prlog.h" +#include "mozilla/Logging.h" static PRLogModuleInfo * GetLoaderLog() diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp index 570c8d975aec..cb1e93fe4f14 100644 --- a/layout/style/nsFontFaceLoader.cpp +++ b/layout/style/nsFontFaceLoader.cpp @@ -6,7 +6,7 @@ /* code for loading in @font-face defined font data */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsFontFaceLoader.h" diff --git a/layout/xul/nsXULPopupManager.h b/layout/xul/nsXULPopupManager.h index fb4a28954ff6..9120420d8ab8 100644 --- a/layout/xul/nsXULPopupManager.h +++ b/layout/xul/nsXULPopupManager.h @@ -10,7 +10,7 @@ #ifndef nsXULPopupManager_h__ #define nsXULPopupManager_h__ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIContent.h" #include "nsIRollupListener.h" #include "nsIDOMEventListener.h" diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp index 0819cf12c577..6cf09f48591f 100644 --- a/media/libstagefright/binding/MoofParser.cpp +++ b/media/libstagefright/binding/MoofParser.cpp @@ -7,7 +7,7 @@ #include "mp4_demuxer/SinfParser.h" #include -#include "prlog.h" +#include "mozilla/Logging.h" #if defined(MOZ_FMP4) extern PRLogModuleInfo* GetDemuxerLog(); diff --git a/media/mtransport/logging.h b/media/mtransport/logging.h index 61f2fed0f03f..37f8b71bfbbb 100644 --- a/media/mtransport/logging.h +++ b/media/mtransport/logging.h @@ -10,7 +10,7 @@ #define logging_h__ #include -#include +#include "mozilla/Logging.h" #define ML_EMERG 1 #define ML_ERROR 2 diff --git a/media/webrtc/signaling/src/common/browser_logging/CSFLog.h b/media/webrtc/signaling/src/common/browser_logging/CSFLog.h index 5db2f6b8978c..ba7e8366892c 100644 --- a/media/webrtc/signaling/src/common/browser_logging/CSFLog.h +++ b/media/webrtc/signaling/src/common/browser_logging/CSFLog.h @@ -6,7 +6,7 @@ #define CSFLOG_H #include -#include "prlog.h" +#include "mozilla/Logging.h" typedef enum{ CSF_LOG_CRITICAL =1, diff --git a/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp b/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp index ee8cff376d8f..46f741976fdd 100644 --- a/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp +++ b/media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp @@ -4,7 +4,7 @@ #include "WebRtcLog.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/modules/libjar/nsJAR.h b/modules/libjar/nsJAR.h index 26c5a57c444d..76a14ae05bad 100644 --- a/modules/libjar/nsJAR.h +++ b/modules/libjar/nsJAR.h @@ -9,7 +9,7 @@ #include "nscore.h" #include "prio.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prinrval.h" #include "mozilla/Mutex.h" diff --git a/modules/libjar/nsJARChannel.h b/modules/libjar/nsJARChannel.h index 45c70a2e809c..108e0339311c 100644 --- a/modules/libjar/nsJARChannel.h +++ b/modules/libjar/nsJARChannel.h @@ -24,7 +24,7 @@ #include "nsIURI.h" #include "nsCOMPtr.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" class nsJARInputThunk; diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index 9f993f2118e9..24bfa5626a34 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -20,7 +20,7 @@ #include "nsISupportsUtils.h" #include "prio.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "stdlib.h" #include "nsWildCard.h" #include "nsZipArchive.h" diff --git a/modules/libpref/prefapi.cpp b/modules/libpref/prefapi.cpp index 2ab595288113..e8984332abd9 100644 --- a/modules/libpref/prefapi.cpp +++ b/modules/libpref/prefapi.cpp @@ -25,7 +25,7 @@ #include "plstr.h" #include "pldhash.h" #include "plbase64.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "mozilla/MemoryReporting.h" #include "mozilla/dom/PContent.h" diff --git a/netwerk/base/BackgroundFileSaver.cpp b/netwerk/base/BackgroundFileSaver.cpp index c77f41f8c720..f6e7bcf77395 100644 --- a/netwerk/base/BackgroundFileSaver.cpp +++ b/netwerk/base/BackgroundFileSaver.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "pk11pub.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "ScopedNSSTypes.h" #include "secoidt.h" diff --git a/netwerk/base/Predictor.cpp b/netwerk/base/Predictor.cpp index 01467b291371..cff0b9646c3d 100644 --- a/netwerk/base/Predictor.cpp +++ b/netwerk/base/Predictor.cpp @@ -32,7 +32,7 @@ #ifdef MOZ_NUWA_PROCESS #include "ipc/Nuwa.h" #endif -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Preferences.h" #include "mozilla/Telemetry.h" diff --git a/netwerk/base/nsAsyncRedirectVerifyHelper.cpp b/netwerk/base/nsAsyncRedirectVerifyHelper.cpp index 6a61a6910cc9..846699f29f97 100644 --- a/netwerk/base/nsAsyncRedirectVerifyHelper.cpp +++ b/netwerk/base/nsAsyncRedirectVerifyHelper.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsAsyncRedirectVerifyHelper.h" #include "nsThreadUtils.h" #include "nsNetUtil.h" diff --git a/netwerk/base/nsAsyncStreamCopier.cpp b/netwerk/base/nsAsyncStreamCopier.cpp index ad8584383c08..3b3d9de43d80 100644 --- a/netwerk/base/nsAsyncStreamCopier.cpp +++ b/netwerk/base/nsAsyncStreamCopier.cpp @@ -8,7 +8,7 @@ #include "nsStreamUtils.h" #include "nsThreadUtils.h" #include "nsNetUtil.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/netwerk/base/nsAutodialWin.cpp b/netwerk/base/nsAutodialWin.cpp index e34c27a30c0f..a10d3c2baa1e 100644 --- a/netwerk/base/nsAutodialWin.cpp +++ b/netwerk/base/nsAutodialWin.cpp @@ -12,7 +12,7 @@ #include #include "nsString.h" #include "nsAutodialWin.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsWindowsHelpers.h" #define AUTODIAL_DEFAULT AUTODIAL_NEVER diff --git a/netwerk/base/nsChannelClassifier.cpp b/netwerk/base/nsChannelClassifier.cpp index 7859e1abe1ab..a2be309ac21a 100644 --- a/netwerk/base/nsChannelClassifier.cpp +++ b/netwerk/base/nsChannelClassifier.cpp @@ -31,7 +31,7 @@ #include "mozilla/Preferences.h" -#include "prlog.h" +#include "mozilla/Logging.h" using mozilla::ArrayLength; using mozilla::Preferences; diff --git a/netwerk/base/nsDirectoryIndexStream.cpp b/netwerk/base/nsDirectoryIndexStream.cpp index 2748892b16d7..8333a21002ba 100644 --- a/netwerk/base/nsDirectoryIndexStream.cpp +++ b/netwerk/base/nsDirectoryIndexStream.cpp @@ -16,7 +16,7 @@ #include "nsEscape.h" #include "nsDirectoryIndexStream.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" static PRLogModuleInfo* gLog; diff --git a/netwerk/base/nsInputStreamPump.cpp b/netwerk/base/nsInputStreamPump.cpp index 8feb0bc564f4..9495d1af9240 100644 --- a/netwerk/base/nsInputStreamPump.cpp +++ b/netwerk/base/nsInputStreamPump.cpp @@ -12,7 +12,7 @@ #include "nsIThreadRetargetableStreamListener.h" #include "nsThreadUtils.h" #include "nsCOMPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "GeckoProfiler.h" #include "nsIStreamListener.h" #include "nsILoadGroup.h" diff --git a/netwerk/base/nsLoadGroup.cpp b/netwerk/base/nsLoadGroup.cpp index e334312991c2..96869797d170 100644 --- a/netwerk/base/nsLoadGroup.cpp +++ b/netwerk/base/nsLoadGroup.cpp @@ -11,7 +11,7 @@ #include "nsArrayEnumerator.h" #include "nsCOMArray.h" #include "nsCOMPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsString.h" #include "nsTArray.h" #include "mozilla/Atomics.h" diff --git a/netwerk/base/nsPACMan.h b/netwerk/base/nsPACMan.h index 4b816ded4205..d7ee72e0cd20 100644 --- a/netwerk/base/nsPACMan.h +++ b/netwerk/base/nsPACMan.h @@ -19,7 +19,7 @@ #include "mozilla/LinkedList.h" #include "nsAutoPtr.h" #include "mozilla/TimeStamp.h" -#include "prlog.h" +#include "mozilla/Logging.h" class nsPACMan; class nsISystemProxySettings; diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp index 91099c5a8819..4333bc96dd45 100644 --- a/netwerk/base/nsProtocolProxyService.cpp +++ b/netwerk/base/nsProtocolProxyService.cpp @@ -47,7 +47,7 @@ namespace mozilla { using namespace mozilla; -#include "prlog.h" +#include "mozilla/Logging.h" #undef LOG #define LOG(args) PR_LOG(net::GetProxyLog(), PR_LOG_DEBUG, args) diff --git a/netwerk/base/nsRequestObserverProxy.cpp b/netwerk/base/nsRequestObserverProxy.cpp index af0c46cf3644..16014bc03ff9 100644 --- a/netwerk/base/nsRequestObserverProxy.cpp +++ b/netwerk/base/nsRequestObserverProxy.cpp @@ -9,7 +9,7 @@ #include "nsRequestObserverProxy.h" #include "nsIRequest.h" #include "nsAutoPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/netwerk/base/nsSocketTransportService2.h b/netwerk/base/nsSocketTransportService2.h index a20f669318e2..85f82dea80be 100644 --- a/netwerk/base/nsSocketTransportService2.h +++ b/netwerk/base/nsSocketTransportService2.h @@ -12,7 +12,7 @@ #include "nsEventQueue.h" #include "nsCOMPtr.h" #include "prinrval.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prinit.h" #include "nsIObserver.h" #include "mozilla/Mutex.h" diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp index 4c736c5099df..aef95b7a9939 100644 --- a/netwerk/base/nsStandardURL.cpp +++ b/netwerk/base/nsStandardURL.cpp @@ -15,7 +15,7 @@ #include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsIIDNService.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsAutoPtr.h" #include "nsIURLParser.h" #include "nsNetCID.h" diff --git a/netwerk/cache/nsCache.h b/netwerk/cache/nsCache.h index 3744331b2630..5876b325d81d 100644 --- a/netwerk/cache/nsCache.h +++ b/netwerk/cache/nsCache.h @@ -11,7 +11,7 @@ #ifndef _nsCache_h_ #define _nsCache_h_ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsISupports.h" #include "nsIFile.h" #include "nsAString.h" diff --git a/netwerk/cache2/CacheLog.h b/netwerk/cache2/CacheLog.h index d11fc0d8fe7d..0fdfb90150b6 100644 --- a/netwerk/cache2/CacheLog.h +++ b/netwerk/cache2/CacheLog.h @@ -5,7 +5,7 @@ #ifndef Cache2Log__h__ #define Cache2Log__h__ -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { namespace net { diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp index 85cb00d38bc6..f49bd28b9971 100644 --- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -183,7 +183,7 @@ struct nsListIter // set NSPR_LOG_MODULES=cookie:4 -- shows accepted and rejected cookies // set NSPR_LOG_FILE=cookie.log // -#include "prlog.h" +#include "mozilla/Logging.h" #endif // define logging macros for convenience diff --git a/netwerk/dns/GetAddrInfo.cpp b/netwerk/dns/GetAddrInfo.cpp index 41cb4767731b..78560033cb83 100644 --- a/netwerk/dns/GetAddrInfo.cpp +++ b/netwerk/dns/GetAddrInfo.cpp @@ -22,7 +22,7 @@ #include #endif -#include "prlog.h" +#include "mozilla/Logging.h" static PRLogModuleInfo *gGetAddrInfoLog = PR_NewLogModule("GetAddrInfo"); #define LOG(msg, ...) \ PR_LOG(gGetAddrInfoLog, PR_LOG_DEBUG, ("[DNS]: " msg, ##__VA_ARGS__)) diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp index 6c85a415b250..1379b1bd36f0 100644 --- a/netwerk/dns/nsHostResolver.cpp +++ b/netwerk/dns/nsHostResolver.cpp @@ -23,7 +23,7 @@ #include "prthread.h" #include "prerror.h" #include "prtime.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "pldhash.h" #include "plstr.h" #include "nsURLHelper.h" diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp index bec89d0cc04c..c3c98e157d71 100644 --- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp @@ -7,7 +7,7 @@ #include #include "prprf.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "nsIOService.h" diff --git a/netwerk/protocol/ftp/nsFtpControlConnection.cpp b/netwerk/protocol/ftp/nsFtpControlConnection.cpp index 43f6a4f19467..1350a880a310 100644 --- a/netwerk/protocol/ftp/nsFtpControlConnection.cpp +++ b/netwerk/protocol/ftp/nsFtpControlConnection.cpp @@ -6,7 +6,7 @@ #include "nsIOService.h" #include "nsFtpControlConnection.h" #include "nsFtpProtocolHandler.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIInputStream.h" #include "nsISocketTransportService.h" #include "nsISocketTransport.h" diff --git a/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp b/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp index ee13366aa910..0ea266c88325 100644 --- a/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp +++ b/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp @@ -25,7 +25,7 @@ using namespace mozilla::net; #include "nsFtpProtocolHandler.h" #include "nsFTPChannel.h" #include "nsIStandardURL.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" #include "nsIObserverService.h" diff --git a/netwerk/protocol/rtsp/controller/RtspController.cpp b/netwerk/protocol/rtsp/controller/RtspController.cpp index 5d5b9b703887..68a2b7ffbcea 100644 --- a/netwerk/protocol/rtsp/controller/RtspController.cpp +++ b/netwerk/protocol/rtsp/controller/RtspController.cpp @@ -34,7 +34,7 @@ #include "mozilla/Attributes.h" #include "mozilla/Telemetry.h" #include "mozilla/TimeStamp.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "plbase64.h" #include "prmem.h" diff --git a/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp b/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp index f0ee73897c56..d90590808cee 100644 --- a/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp +++ b/netwerk/protocol/rtsp/controller/RtspControllerChild.cpp @@ -14,7 +14,7 @@ #include "mozilla/ipc/InputStreamUtils.h" #include "mozilla/ipc/URIUtils.h" #include "nsStringStream.h" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo* gRtspChildLog = nullptr; #undef LOG diff --git a/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp b/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp index 22eacc279e09..9fcb1dfec4c0 100644 --- a/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp +++ b/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp @@ -13,7 +13,7 @@ #include "mozilla/ipc/URIUtils.h" #include "mozilla/unused.h" #include "nsNetUtil.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include diff --git a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp index e773e3253343..1ee5fb338bb2 100644 --- a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp +++ b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "RtspMetaData.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h b/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h index 32962c833572..a49231fe8cda 100644 --- a/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h +++ b/netwerk/protocol/rtsp/rtsp/RTSPConnectionHandler.h @@ -39,7 +39,7 @@ #include #include "nsPrintfCString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prio.h" #include "prnetdb.h" diff --git a/netwerk/protocol/rtsp/rtsp/RtspPrlog.h b/netwerk/protocol/rtsp/rtsp/RtspPrlog.h index 875a8cac3378..63007afe34cd 100644 --- a/netwerk/protocol/rtsp/rtsp/RtspPrlog.h +++ b/netwerk/protocol/rtsp/rtsp/RtspPrlog.h @@ -7,7 +7,7 @@ #ifndef RTSPPRLOG_H #define RTSPPRLOG_H -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gRtspLog; diff --git a/netwerk/protocol/websocket/WebSocketLog.h b/netwerk/protocol/websocket/WebSocketLog.h index 6e5008be113d..5197aa818e69 100644 --- a/netwerk/protocol/websocket/WebSocketLog.h +++ b/netwerk/protocol/websocket/WebSocketLog.h @@ -8,7 +8,7 @@ #define WebSocketLog_h #include "base/basictypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/net/NeckoChild.h" extern PRLogModuleInfo* webSocketLog; diff --git a/netwerk/protocol/wyciwyg/nsWyciwyg.h b/netwerk/protocol/wyciwyg/nsWyciwyg.h index a2849df0ffa1..55d2d5c6d13e 100644 --- a/netwerk/protocol/wyciwyg/nsWyciwyg.h +++ b/netwerk/protocol/wyciwyg/nsWyciwyg.h @@ -10,7 +10,7 @@ // Get rid of chromium's LOG. #undef LOG -#include "prlog.h" +#include "mozilla/Logging.h" // // Log module for HTTP Protocol logging... diff --git a/netwerk/sctp/datachannel/DataChannelLog.h b/netwerk/sctp/datachannel/DataChannelLog.h index 1fb1b3861747..4f832812a885 100644 --- a/netwerk/sctp/datachannel/DataChannelLog.h +++ b/netwerk/sctp/datachannel/DataChannelLog.h @@ -8,7 +8,7 @@ #define DataChannelLog_h #include "base/basictypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* GetDataChannelLog(); extern PRLogModuleInfo* GetSCTPLog(); diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 2aa0dae50a69..d165bde4b3f8 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -6,7 +6,7 @@ #include "nsFTPDirListingConv.h" #include "nsMemory.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsCOMPtr.h" #include "nsEscape.h" #include "nsStringStream.h" diff --git a/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp b/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp index 00adcb773f7c..0a54de5410b2 100644 --- a/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp +++ b/netwerk/system/linux/nsNotifyAddrListener_Linux.cpp @@ -19,7 +19,7 @@ #include "nsNotifyAddrListener_Linux.h" #include "nsString.h" #include "nsAutoPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Services.h" #include "mozilla/Preferences.h" diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp index 2701275f79aa..d05d1e404a29 100644 --- a/netwerk/system/win32/nsNotifyAddrListener.cpp +++ b/netwerk/system/win32/nsNotifyAddrListener.cpp @@ -19,7 +19,7 @@ #include #include #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsThreadUtils.h" #include "nsIObserverService.h" #include "nsServiceManagerUtils.h" diff --git a/netwerk/test/TestBlockingSocket.cpp b/netwerk/test/TestBlockingSocket.cpp index 2830dbc903b2..d7d420fb8620 100644 --- a/netwerk/test/TestBlockingSocket.cpp +++ b/netwerk/test/TestBlockingSocket.cpp @@ -12,7 +12,7 @@ #include "nsStringAPI.h" #include "nsIFile.h" #include "nsNetUtil.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "prthread.h" #include diff --git a/netwerk/test/TestIOThreads.cpp b/netwerk/test/TestIOThreads.cpp index 20daefe8ff9a..699c3d2a25bc 100644 --- a/netwerk/test/TestIOThreads.cpp +++ b/netwerk/test/TestIOThreads.cpp @@ -9,7 +9,7 @@ #include "nsIEventTarget.h" #include "nsCOMPtr.h" #include "nsNetCID.h" -#include "prlog.h" +#include "mozilla/Logging.h" // // set NSPR_LOG_MODULES=Test:5 diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp index ecce8a20c6d9..01cd078e202f 100644 --- a/netwerk/test/TestProtocols.cpp +++ b/netwerk/test/TestProtocols.cpp @@ -55,7 +55,7 @@ #include "nsISimpleEnumerator.h" #include "nsStringAPI.h" #include "nsNetUtil.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/netwerk/test/TestServ.cpp b/netwerk/test/TestServ.cpp index aed92f26c3a9..ac89ea057c12 100644 --- a/netwerk/test/TestServ.cpp +++ b/netwerk/test/TestServ.cpp @@ -11,7 +11,7 @@ #include "nsNetUtil.h" #include "nsStringAPI.h" #include "nsCOMPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" // // set NSPR_LOG_MODULES=Test:5 diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index d657aba50739..550e3b8cb3de 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -23,7 +23,7 @@ #include "nsIFile.h" #include "nsNetUtil.h" #include "nsAutoLock.h" -#include "prlog.h" +#include "mozilla/Logging.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestStreamChannel.cpp b/netwerk/test/TestStreamChannel.cpp index 8452f8eb7924..775375da0c4c 100644 --- a/netwerk/test/TestStreamChannel.cpp +++ b/netwerk/test/TestStreamChannel.cpp @@ -20,7 +20,7 @@ #include "nsIFile.h" #include "nsNetUtil.h" #include "nsAutoLock.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestStreamLoader.cpp b/netwerk/test/TestStreamLoader.cpp index e43bf94bc550..adaee65feef8 100644 --- a/netwerk/test/TestStreamLoader.cpp +++ b/netwerk/test/TestStreamLoader.cpp @@ -2,7 +2,7 @@ #include "TestCommon.h" #include "nsNetUtil.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Attributes.h" #include "nsIScriptSecurityManager.h" diff --git a/netwerk/test/TestStreamPump.cpp b/netwerk/test/TestStreamPump.cpp index 6a006e48e278..7f27e5e00a6f 100644 --- a/netwerk/test/TestStreamPump.cpp +++ b/netwerk/test/TestStreamPump.cpp @@ -21,7 +21,7 @@ #include "nsIFile.h" #include "nsNetUtil.h" #include "nsAutoLock.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include diff --git a/netwerk/test/TestStreamTransport.cpp b/netwerk/test/TestStreamTransport.cpp index c8e12e4dd03a..0a286a9d53ab 100644 --- a/netwerk/test/TestStreamTransport.cpp +++ b/netwerk/test/TestStreamTransport.cpp @@ -20,7 +20,7 @@ #include "nsIFile.h" #include "nsNetUtil.h" #include "nsAutoLock.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestUpload.cpp b/netwerk/test/TestUpload.cpp index b01cf13b2763..2af5b9a86dbb 100644 --- a/netwerk/test/TestUpload.cpp +++ b/netwerk/test/TestUpload.cpp @@ -15,7 +15,7 @@ #include "nsIUploadChannel.h" -#include "prlog.h" +#include "mozilla/Logging.h" // // set NSPR_LOG_MODULES=Test:5 // diff --git a/netwerk/wifi/nsWifiAccessPoint.cpp b/netwerk/wifi/nsWifiAccessPoint.cpp index a2f1d17fb4c6..1243abdf67b1 100644 --- a/netwerk/wifi/nsWifiAccessPoint.cpp +++ b/netwerk/wifi/nsWifiAccessPoint.cpp @@ -5,7 +5,7 @@ #include "nsWifiAccessPoint.h" #include "nsString.h" #include "nsMemory.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo *gWifiMonitorLog; #define LOG(args) PR_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args) diff --git a/netwerk/wifi/nsWifiMonitor.h b/netwerk/wifi/nsWifiMonitor.h index 3e462facada4..21f4c8a0a1a1 100644 --- a/netwerk/wifi/nsWifiMonitor.h +++ b/netwerk/wifi/nsWifiMonitor.h @@ -15,7 +15,7 @@ #include "nsIWifiListener.h" #include "mozilla/Atomics.h" #include "mozilla/ReentrantMonitor.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIObserver.h" #include "nsTArray.h" #include "nsITimer.h" diff --git a/parser/html/nsHtml5NamedCharacters.cpp b/parser/html/nsHtml5NamedCharacters.cpp index d7da564829b0..8b38685596f8 100644 --- a/parser/html/nsHtml5NamedCharacters.cpp +++ b/parser/html/nsHtml5NamedCharacters.cpp @@ -25,7 +25,7 @@ #include "nscore.h" #include "nsDebug.h" #include "mozilla/ArrayUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsHtml5NamedCharacters.h" diff --git a/parser/html/nsHtml5NamedCharacters.h b/parser/html/nsHtml5NamedCharacters.h index e80655e37a37..9c6cc3a9bd25 100644 --- a/parser/html/nsHtml5NamedCharacters.h +++ b/parser/html/nsHtml5NamedCharacters.h @@ -26,7 +26,7 @@ #include "jArray.h" #include "nscore.h" #include "nsDebug.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsMemory.h" struct nsHtml5CharacterName { diff --git a/parser/html/nsHtml5NamedCharactersAccel.h b/parser/html/nsHtml5NamedCharactersAccel.h index 8098c00c4fd4..8e6df8ebbb44 100644 --- a/parser/html/nsHtml5NamedCharactersAccel.h +++ b/parser/html/nsHtml5NamedCharactersAccel.h @@ -12,7 +12,7 @@ #include "jArray.h" #include "nscore.h" #include "nsDebug.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsMemory.h" class nsHtml5NamedCharactersAccel diff --git a/rdf/base/nsCompositeDataSource.cpp b/rdf/base/nsCompositeDataSource.cpp index 7a96e20d54de..b42ae54603fb 100644 --- a/rdf/base/nsCompositeDataSource.cpp +++ b/rdf/base/nsCompositeDataSource.cpp @@ -42,7 +42,7 @@ #include "nsEnumeratorUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include PRLogModuleInfo* nsRDFLog = nullptr; diff --git a/rdf/base/nsContainerEnumerator.cpp b/rdf/base/nsContainerEnumerator.cpp index b26988b47868..f1bfc645460d 100644 --- a/rdf/base/nsContainerEnumerator.cpp +++ b/rdf/base/nsContainerEnumerator.cpp @@ -30,7 +30,7 @@ #include "nsRDFCID.h" #include "nsString.h" #include "nsXPIDLString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "rdfutil.h" diff --git a/rdf/base/nsInMemoryDataSource.cpp b/rdf/base/nsInMemoryDataSource.cpp index 66c1724e07d8..917a0d7aa067 100644 --- a/rdf/base/nsInMemoryDataSource.cpp +++ b/rdf/base/nsInMemoryDataSource.cpp @@ -63,7 +63,7 @@ #include "rdfutil.h" #include "pldhash.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "rdfIDataSource.h" diff --git a/rdf/base/nsRDFContentSink.cpp b/rdf/base/nsRDFContentSink.cpp index 0bd9fe1e787e..3409901a3f4a 100644 --- a/rdf/base/nsRDFContentSink.cpp +++ b/rdf/base/nsRDFContentSink.cpp @@ -53,7 +53,7 @@ #include "nsRDFCID.h" #include "nsTArray.h" #include "nsXPIDLString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "rdf.h" #include "rdfutil.h" #include "nsReadableUtils.h" diff --git a/rdf/base/nsRDFService.cpp b/rdf/base/nsRDFService.cpp index 237e86124fcd..07ad6de984f6 100644 --- a/rdf/base/nsRDFService.cpp +++ b/rdf/base/nsRDFService.cpp @@ -49,7 +49,7 @@ #include "pldhash.h" #include "plhash.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "prmem.h" #include "rdf.h" diff --git a/rdf/base/nsRDFXMLDataSource.cpp b/rdf/base/nsRDFXMLDataSource.cpp index 3af4e16d3e8d..6449c3c1b2e8 100644 --- a/rdf/base/nsRDFXMLDataSource.cpp +++ b/rdf/base/nsRDFXMLDataSource.cpp @@ -86,7 +86,7 @@ #include "prthread.h" #include "rdf.h" #include "rdfutil.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsNameSpaceMap.h" #include "nsCRT.h" #include "nsCycleCollectionParticipant.h" diff --git a/rdf/util/nsRDFResource.cpp b/rdf/util/nsRDFResource.cpp index f7920667b1de..0e6f01f14a64 100644 --- a/rdf/util/nsRDFResource.cpp +++ b/rdf/util/nsRDFResource.cpp @@ -8,7 +8,7 @@ #include "nsIRDFDelegateFactory.h" #include "nsIRDFService.h" #include "nsRDFCID.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsComponentManagerUtils.h" #include "nsServiceManagerUtils.h" diff --git a/security/apps/AppSignatureVerification.cpp b/security/apps/AppSignatureVerification.cpp index a0c83848f972..4aa8afa0974a 100644 --- a/security/apps/AppSignatureVerification.cpp +++ b/security/apps/AppSignatureVerification.cpp @@ -30,7 +30,7 @@ #include "nsString.h" #include "nsTHashtable.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "pkix/pkix.h" #include "pkix/pkixnss.h" #include "secmime.h" diff --git a/security/manager/boot/src/CertBlocklist.cpp b/security/manager/boot/src/CertBlocklist.cpp index a9881e21c523..8899c357edb0 100644 --- a/security/manager/boot/src/CertBlocklist.cpp +++ b/security/manager/boot/src/CertBlocklist.cpp @@ -19,7 +19,7 @@ #include "nsTHashtable.h" #include "nsThreadUtils.h" #include "pkix/Input.h" -#include "prlog.h" +#include "mozilla/Logging.h" NS_IMPL_ISUPPORTS(CertBlocklist, nsICertBlocklist) diff --git a/security/manager/boot/src/PublicKeyPinningService.cpp b/security/manager/boot/src/PublicKeyPinningService.cpp index bbdb3319fa17..e19c4cd01488 100644 --- a/security/manager/boot/src/PublicKeyPinningService.cpp +++ b/security/manager/boot/src/PublicKeyPinningService.cpp @@ -11,7 +11,7 @@ #include "nsSiteSecurityService.h" #include "nssb64.h" #include "pkix/pkixtypes.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "RootCertificateTelemetryUtils.h" #include "ScopedNSSTypes.h" #include "seccomon.h" diff --git a/security/manager/boot/src/RootCertificateTelemetryUtils.cpp b/security/manager/boot/src/RootCertificateTelemetryUtils.cpp index 6addc4fa044f..1e4ca76468ce 100644 --- a/security/manager/boot/src/RootCertificateTelemetryUtils.cpp +++ b/security/manager/boot/src/RootCertificateTelemetryUtils.cpp @@ -6,7 +6,7 @@ #include "RootCertificateTelemetryUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "RootHashes.inc" // Note: Generated by genRootCAHashes.js #include "ScopedNSSTypes.h" #include "mozilla/ArrayUtils.h" diff --git a/security/manager/boot/src/nsEntropyCollector.cpp b/security/manager/boot/src/nsEntropyCollector.cpp index ef53d8717ecd..5a2df5bf3a10 100644 --- a/security/manager/boot/src/nsEntropyCollector.cpp +++ b/security/manager/boot/src/nsEntropyCollector.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsEntropyCollector.h" #include "nsAlgorithm.h" #include diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp index f9f8206752a8..dbc40a8b51c2 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nspr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsISecureBrowserUI.h" #include "nsSecureBrowserUIImpl.h" diff --git a/security/manager/boot/src/nsSecurityHeaderParser.cpp b/security/manager/boot/src/nsSecurityHeaderParser.cpp index 7a2bd58ded75..514742bf2e3e 100644 --- a/security/manager/boot/src/nsSecurityHeaderParser.cpp +++ b/security/manager/boot/src/nsSecurityHeaderParser.cpp @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsSecurityHeaderParser.h" -#include "prlog.h" +#include "mozilla/Logging.h" // The character classes in this file are informed by [RFC2616], Section 2.2. // signed char is a signed data type one byte (8 bits) wide, so its value can diff --git a/security/manager/boot/src/nsSiteSecurityService.cpp b/security/manager/boot/src/nsSiteSecurityService.cpp index f754aceaec95..40ae05866742 100644 --- a/security/manager/boot/src/nsSiteSecurityService.cpp +++ b/security/manager/boot/src/nsSiteSecurityService.cpp @@ -21,7 +21,7 @@ #include "nsXULAppAPI.h" #include "pkix/pkixtypes.h" #include "plstr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prnetdb.h" #include "prprf.h" #include "PublicKeyPinningService.h" diff --git a/security/manager/ssl/src/PSMContentListener.cpp b/security/manager/ssl/src/PSMContentListener.cpp index 61a4083148e1..83aa92c16d53 100644 --- a/security/manager/ssl/src/PSMContentListener.cpp +++ b/security/manager/ssl/src/PSMContentListener.cpp @@ -24,7 +24,7 @@ #include "nsNetUtil.h" #include "nsNSSHelper.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gPIPNSSLog; diff --git a/security/manager/ssl/src/nsCertTree.cpp b/security/manager/ssl/src/nsCertTree.cpp index 94209f763ec6..796368702436 100644 --- a/security/manager/ssl/src/nsCertTree.cpp +++ b/security/manager/ssl/src/nsCertTree.cpp @@ -22,7 +22,7 @@ #include "nsTHashtable.h" #include "nsHashKeys.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index cef376a8e76e..de3e706b8813 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -14,7 +14,7 @@ #include "mozilla/UniquePtr.h" #include "mozilla/Telemetry.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prmem.h" #include "prnetdb.h" #include "nsIPrefService.h" diff --git a/security/manager/ssl/src/nsNTLMAuthModule.cpp b/security/manager/ssl/src/nsNTLMAuthModule.cpp index 9d7c1141c082..a4b1587d983e 100644 --- a/security/manager/ssl/src/nsNTLMAuthModule.cpp +++ b/security/manager/ssl/src/nsNTLMAuthModule.cpp @@ -24,7 +24,7 @@ #include "nsNSSShutDown.h" #include "nsUnicharUtils.h" #include "pk11pub.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prsystem.h" static bool sNTLMv1Forced = false; diff --git a/storage/src/VacuumManager.cpp b/storage/src/VacuumManager.cpp index 1417dae1ce75..cd3faa0344c2 100644 --- a/storage/src/VacuumManager.cpp +++ b/storage/src/VacuumManager.cpp @@ -13,7 +13,7 @@ #include "nsIObserverService.h" #include "nsIFile.h" #include "nsThreadUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "mozStorageConnection.h" diff --git a/storage/src/mozStorageAsyncStatement.cpp b/storage/src/mozStorageAsyncStatement.cpp index 2c03cab59433..08c64fe269d8 100644 --- a/storage/src/mozStorageAsyncStatement.cpp +++ b/storage/src/mozStorageAsyncStatement.cpp @@ -25,7 +25,7 @@ #include "mozStorageStatement.h" #include "nsDOMClassInfo.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo *gStorageLog; diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp index 89f4d05d6f69..8e9456a778b4 100644 --- a/storage/src/mozStorageConnection.cpp +++ b/storage/src/mozStorageConnection.cpp @@ -37,7 +37,7 @@ #include "mozStorageHelper.h" #include "GeckoProfiler.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "nsProxyRelease.h" #include diff --git a/storage/src/mozStoragePrivateHelpers.cpp b/storage/src/mozStoragePrivateHelpers.cpp index afd7f4a0c460..9ae13f42e30a 100644 --- a/storage/src/mozStoragePrivateHelpers.cpp +++ b/storage/src/mozStoragePrivateHelpers.cpp @@ -23,7 +23,7 @@ #include "mozIStorageCompletionCallback.h" #include "mozIStorageBindingParams.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gStorageLog; namespace mozilla { diff --git a/storage/src/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp index 9b6ea3a0b504..3c01a6933b2d 100644 --- a/storage/src/mozStorageStatement.cpp +++ b/storage/src/mozStorageStatement.cpp @@ -25,7 +25,7 @@ #include "GeckoProfiler.h" #include "nsDOMClassInfo.h" -#include "prlog.h" +#include "mozilla/Logging.h" extern PRLogModuleInfo* gStorageLog; diff --git a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp index ffccc9d5872b..a4bb8fc4ff51 100644 --- a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp +++ b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp @@ -15,7 +15,7 @@ #include "nsIObserverService.h" #include "nsProxyRelease.h" #include "nsTArray.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp index 513d0c7d834b..74a18e80e4b7 100644 --- a/toolkit/components/url-classifier/Classifier.cpp +++ b/toolkit/components/url-classifier/Classifier.cpp @@ -13,7 +13,7 @@ #include "nsIFile.h" #include "nsThreadUtils.h" #include "mozilla/Telemetry.h" -#include "prlog.h" +#include "mozilla/Logging.h" // NSPR_LOG_MODULES=UrlClassifierDbService:5 extern PRLogModuleInfo *gUrlClassifierDbServiceLog; diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp index 4919443b002f..e74e83fea163 100644 --- a/toolkit/components/url-classifier/HashStore.cpp +++ b/toolkit/components/url-classifier/HashStore.cpp @@ -35,7 +35,7 @@ #include "nsIStreamConverterService.h" #include "nsNetUtil.h" #include "nsCheckSummedOutputStream.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "zlib.h" // Main store for SafeBrowsing protocol data. We store diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp index 901bb195ac0a..56b670051405 100644 --- a/toolkit/components/url-classifier/LookupCache.cpp +++ b/toolkit/components/url-classifier/LookupCache.cpp @@ -7,7 +7,7 @@ #include "HashStore.h" #include "nsISeekableStream.h" #include "mozilla/Telemetry.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" // We act as the main entry point for all the real lookups, diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h index cd1464447d10..64030a34930e 100644 --- a/toolkit/components/url-classifier/LookupCache.h +++ b/toolkit/components/url-classifier/LookupCache.h @@ -13,7 +13,7 @@ #include "nsIFile.h" #include "nsIFileStreams.h" #include "nsUrlClassifierPrefixSet.h" -#include "prlog.h" +#include "mozilla/Logging.h" namespace mozilla { namespace safebrowsing { diff --git a/toolkit/components/url-classifier/ProtocolParser.cpp b/toolkit/components/url-classifier/ProtocolParser.cpp index 553665e820f5..76fe761ac14d 100644 --- a/toolkit/components/url-classifier/ProtocolParser.cpp +++ b/toolkit/components/url-classifier/ProtocolParser.cpp @@ -6,7 +6,7 @@ #include "ProtocolParser.h" #include "LookupCache.h" #include "nsNetCID.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prnetdb.h" #include "prprf.h" diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index f6c432e46255..d58adb58e212 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -38,7 +38,7 @@ #include "mozilla/Preferences.h" #include "mozilla/TimeStamp.h" #include "mozilla/Telemetry.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "prnetdb.h" #include "Entries.h" diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp index 28a8a523a46b..fce84c0a19c8 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp @@ -18,7 +18,7 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/Telemetry.h" #include "mozilla/FileUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp index 1052a28d2144..ce64cf96cc19 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp @@ -14,7 +14,7 @@ #include "nsStringStream.h" #include "nsToolkitCompsCID.h" #include "nsUrlClassifierStreamUpdater.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIInterfaceRequestor.h" #include "mozilla/LoadContext.h" #include "nsContentUtils.h" diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 0180e519bf52..1477fc751d37 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -176,7 +176,7 @@ #endif #ifdef DEBUG -#include "prlog.h" +#include "mozilla/Logging.h" #endif #ifdef MOZ_JPROF diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index dd92dfdd99ba..bc9e34706cd3 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -15,7 +15,7 @@ #include "nsCOMPtr.h" #include "nsString.h" #include "prproces.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "nsVersionComparator.h" #include "nsXREDirProvider.h" diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 6459dc05c173..0b1cee98f6c1 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nspr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsDocLoader.h" #include "nsCURILoader.h" diff --git a/uriloader/base/nsURILoader.h b/uriloader/base/nsURILoader.h index 7b9de35aeb60..c909300078a9 100644 --- a/uriloader/base/nsURILoader.h +++ b/uriloader/base/nsURILoader.h @@ -16,7 +16,7 @@ #include "nsIWeakReference.h" #include "mozilla/Attributes.h" -#include "prlog.h" +#include "mozilla/Logging.h" class nsDocumentOpenInfo; diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index f182929bde3e..235c26b91a1e 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -6,7 +6,7 @@ #ifndef nsExternalHelperAppService_h__ #define nsExternalHelperAppService_h__ -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "nsIExternalHelperAppService.h" diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.cpp b/uriloader/prefetch/OfflineCacheUpdateChild.cpp index 041c96146001..d5230c7cb476 100644 --- a/uriloader/prefetch/OfflineCacheUpdateChild.cpp +++ b/uriloader/prefetch/OfflineCacheUpdateChild.cpp @@ -28,7 +28,7 @@ #include "nsStreamUtils.h" #include "nsThreadUtils.h" #include "nsProxyRelease.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIAsyncVerifyRedirectCallback.h" using namespace mozilla::ipc; diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp index b8b0d2ad50dc..fcbb97781d85 100644 --- a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp +++ b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp @@ -12,7 +12,7 @@ #include "nsIApplicationCacheContainer.h" #include "nsIChannel.h" #include "nsIDocument.h" -#include "prlog.h" +#include "mozilla/Logging.h" // // To enable logging (see prlog.h for full details): diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/uriloader/prefetch/nsOfflineCacheUpdate.cpp index 6300d59e1581..bd81c2d2ba1b 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdate.cpp @@ -32,7 +32,7 @@ #include "nsThreadUtils.h" #include "nsProxyRelease.h" #include "nsIConsoleService.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIAsyncVerifyRedirectCallback.h" #include "mozilla/Preferences.h" #include "mozilla/Attributes.h" diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp index a9b181ddee46..c2b5fe533913 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp @@ -36,7 +36,7 @@ #include "nsStreamUtils.h" #include "nsThreadUtils.h" #include "nsProxyRelease.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIAsyncVerifyRedirectCallback.h" #include "mozilla/Preferences.h" #include "mozilla/Attributes.h" diff --git a/uriloader/prefetch/nsPrefetchService.cpp b/uriloader/prefetch/nsPrefetchService.cpp index ceb399e57d3a..24cf92de6725 100644 --- a/uriloader/prefetch/nsPrefetchService.cpp +++ b/uriloader/prefetch/nsPrefetchService.cpp @@ -20,7 +20,7 @@ #include "nsStreamUtils.h" #include "nsAutoPtr.h" #include "prtime.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "plstr.h" #include "nsIAsyncVerifyRedirectCallback.h" #include "mozilla/Preferences.h" diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index fb4f9161cf43..325f38ebfc1c 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -52,7 +52,7 @@ #endif #ifdef MOZ_LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #endif #ifdef DEBUG_ANDROID_EVENTS diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.mm index e5dde9c90a14..b1e32a5b9e8b 100644 --- a/widget/cocoa/NativeKeyBindings.mm +++ b/widget/cocoa/NativeKeyBindings.mm @@ -7,7 +7,7 @@ #include "nsTArray.h" #include "nsCocoaUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/TextEvents.h" namespace mozilla { diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm index f8038e4f6e86..43f41eb10ae2 100644 --- a/widget/cocoa/TextInputHandler.mm +++ b/widget/cocoa/TextInputHandler.mm @@ -8,7 +8,7 @@ #include "TextInputHandler.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/MiscEvents.h" #include "mozilla/MouseEvents.h" diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 32adbddb74df..8f54c41e71e1 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -5,7 +5,7 @@ #include "mozilla/ArrayUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include #include diff --git a/widget/cocoa/nsClipboard.mm b/widget/cocoa/nsClipboard.mm index a1c0f0fc589b..0de37a780731 100644 --- a/widget/cocoa/nsClipboard.mm +++ b/widget/cocoa/nsClipboard.mm @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/unused.h" diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm index b806972793a7..2df28a762160 100644 --- a/widget/cocoa/nsDragService.mm +++ b/widget/cocoa/nsDragService.mm @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsDragService.h" #include "nsObjCExceptions.h" diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp index 090100f1edca..6d4a61d50c10 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -12,7 +12,7 @@ #include #include "nsAppShell.h" #include "nsWindow.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "mozilla/HangMonitor.h" #include "mozilla/unused.h" diff --git a/widget/gtk/nsDeviceContextSpecG.cpp b/widget/gtk/nsDeviceContextSpecG.cpp index 008ea89b5e41..1583d986be90 100644 --- a/widget/gtk/nsDeviceContextSpecG.cpp +++ b/widget/gtk/nsDeviceContextSpecG.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "plstr.h" diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp index 7b30da1a0ee4..ce2af51162b9 100644 --- a/widget/gtk/nsDragService.cpp +++ b/widget/gtk/nsDragService.cpp @@ -14,7 +14,7 @@ #include "nsIIOService.h" #include "nsIFileURL.h" #include "nsNetUtil.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" #include "nsPrimitiveHelpers.h" #include "prtime.h" diff --git a/widget/gtk/nsGtkIMModule.cpp b/widget/gtk/nsGtkIMModule.cpp index 9704b2dde9b2..885e7b4e63df 100644 --- a/widget/gtk/nsGtkIMModule.cpp +++ b/widget/gtk/nsGtkIMModule.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "nsGtkIMModule.h" diff --git a/widget/gtk/nsGtkKeyUtils.cpp b/widget/gtk/nsGtkKeyUtils.cpp index 37da5d6c8b24..9fbca0637825 100644 --- a/widget/gtk/nsGtkKeyUtils.cpp +++ b/widget/gtk/nsGtkKeyUtils.cpp @@ -5,7 +5,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsGtkKeyUtils.h" diff --git a/widget/gtk/nsIdleServiceGTK.cpp b/widget/gtk/nsIdleServiceGTK.cpp index b6cf392bbd8d..d608f32021d6 100644 --- a/widget/gtk/nsIdleServiceGTK.cpp +++ b/widget/gtk/nsIdleServiceGTK.cpp @@ -11,7 +11,7 @@ #include "nsIServiceManager.h" #include "nsDebug.h" #include "prlink.h" -#include "prlog.h" +#include "mozilla/Logging.h" static PRLogModuleInfo* sIdleLog = nullptr; diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h index 697777c82266..ba80946c1420 100644 --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -36,7 +36,7 @@ #undef LOG #ifdef MOZ_LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" #include "Units.h" diff --git a/widget/nsIdleService.cpp b/widget/nsIdleService.cpp index 379988aa1220..f13fa32f3a3a 100644 --- a/widget/nsIdleService.cpp +++ b/widget/nsIdleService.cpp @@ -13,7 +13,7 @@ #include "nsCOMArray.h" #include "nsXULAppAPI.h" #include "prinrval.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/Services.h" diff --git a/widget/qt/nsAppShell.cpp b/widget/qt/nsAppShell.cpp index 194743c2e145..5b815d4a34b0 100644 --- a/widget/qt/nsAppShell.cpp +++ b/widget/qt/nsAppShell.cpp @@ -18,7 +18,7 @@ #include "nsQAppInstance.h" #ifdef MOZ_LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #endif PRLogModuleInfo *gWidgetLog = nullptr; diff --git a/widget/qt/nsDeviceContextSpecQt.cpp b/widget/qt/nsDeviceContextSpecQt.cpp index 309de21386c4..87d0b4e3e738 100644 --- a/widget/qt/nsDeviceContextSpecQt.cpp +++ b/widget/qt/nsDeviceContextSpecQt.cpp @@ -10,7 +10,7 @@ #define SET_PRINTER_FEATURES_VIA_PREFS 1 #define PRINTERFEATURES_PREF "print.tmp.printerfeatures" -#include "prlog.h" +#include "mozilla/Logging.h" #include "plstr.h" diff --git a/widget/qt/nsWindow.h b/widget/qt/nsWindow.h index 2675939eeb18..83e65ef28cb1 100644 --- a/widget/qt/nsWindow.h +++ b/widget/qt/nsWindow.h @@ -21,7 +21,7 @@ #ifdef MOZ_LOGGING -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" extern PRLogModuleInfo *gWidgetLog; diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp index 25639ba6c831..0f17adf1559e 100644 --- a/widget/windows/KeyboardLayout.cpp +++ b/widget/windows/KeyboardLayout.cpp @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/ArrayUtils.h" #include "mozilla/DebugOnly.h" diff --git a/widget/windows/WinMouseScrollHandler.cpp b/widget/windows/WinMouseScrollHandler.cpp index e6b431b44ce5..8a33abd9f01e 100644 --- a/widget/windows/WinMouseScrollHandler.cpp +++ b/widget/windows/WinMouseScrollHandler.cpp @@ -6,7 +6,7 @@ #include "mozilla/DebugOnly.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "WinMouseScrollHandler.h" #include "nsWindow.h" diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp index 157506b2a335..767a924b7a06 100644 --- a/widget/windows/WinUtils.cpp +++ b/widget/windows/WinUtils.cpp @@ -20,7 +20,7 @@ #include "nsIContentPolicy.h" #include "nsContentUtils.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsString.h" #include "nsDirectoryServiceUtils.h" diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 86325eb0934e..6538d7e459f1 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -41,7 +41,7 @@ #include "nsIStringBundle.h" #define NS_ERROR_GFX_PRINTER_BUNDLE_URL "chrome://global/locale/printing.properties" -#include "prlog.h" +#include "mozilla/Logging.h" PRLogModuleInfo * kWidgetPrintingLogMod = PR_NewLogModule("printing-widget"); #define PR_PL(_p1) PR_LOG(kWidgetPrintingLogMod, PR_LOG_DEBUG, _p1) diff --git a/widget/windows/nsIMM32Handler.cpp b/widget/windows/nsIMM32Handler.cpp index 3f4e4f986392..23e0b5e94175 100644 --- a/widget/windows/nsIMM32Handler.cpp +++ b/widget/windows/nsIMM32Handler.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIMM32Handler.h" #include "nsWindow.h" diff --git a/widget/windows/nsSound.cpp b/widget/windows/nsSound.cpp index 8bef15580ed7..dd3efb5a6714 100644 --- a/widget/windows/nsSound.cpp +++ b/widget/windows/nsSound.cpp @@ -19,7 +19,7 @@ #include "nsContentUtils.h" #include "nsCRT.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "prprf.h" #include "prmem.h" diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp index 337432fb7204..234c8d978af1 100644 --- a/widget/windows/nsTextStore.cpp +++ b/widget/windows/nsTextStore.cpp @@ -6,7 +6,7 @@ #include #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "nscore.h" #include "nsWindow.h" diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index ee4a5259a837..7b14dfc60fc8 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -75,7 +75,7 @@ #include #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "prtime.h" #include "prprf.h" #include "prmem.h" diff --git a/widget/xremoteclient/XRemoteClient.cpp b/widget/xremoteclient/XRemoteClient.cpp index 66d278642519..2ede5b5c6e4d 100644 --- a/widget/xremoteclient/XRemoteClient.cpp +++ b/widget/xremoteclient/XRemoteClient.cpp @@ -12,7 +12,7 @@ #include "prprf.h" #include "plstr.h" #include "prsystem.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prenv.h" #include "prdtoa.h" #include diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp index 0bca387cb13d..9419986d5e5e 100644 --- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -17,7 +17,7 @@ #include "nsString.h" #include "nsXULAppAPI.h" #include "prprf.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsError.h" #include "prerror.h" #include "prerr.h" diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h index 230520c8b8a3..8f2e50652c1d 100644 --- a/xpcom/build/nsXULAppAPI.h +++ b/xpcom/build/nsXULAppAPI.h @@ -11,7 +11,7 @@ #include "xrecore.h" #include "nsXPCOM.h" #include "nsISupports.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsXREAppData.h" #include "js/TypeDecls.h" diff --git a/xpcom/build/perfprobe.h b/xpcom/build/perfprobe.h index c5699a07324d..718b75127ef7 100644 --- a/xpcom/build/perfprobe.h +++ b/xpcom/build/perfprobe.h @@ -18,7 +18,7 @@ #include "nsError.h" #include "nsString.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" #include "nsAutoPtr.h" #include diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index d5a6adf6601c..140e4473dbad 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -77,7 +77,7 @@ #include "mozilla/Omnijar.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/xpcom/components/nsNativeModuleLoader.cpp b/xpcom/components/nsNativeModuleLoader.cpp index 0604c97d9afd..8ffd5a0dc7aa 100644 --- a/xpcom/components/nsNativeModuleLoader.cpp +++ b/xpcom/components/nsNativeModuleLoader.cpp @@ -17,7 +17,7 @@ #include "nsNativeModuleLoader.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prinit.h" #include "prerror.h" diff --git a/xpcom/ds/TimeStamp_windows.cpp b/xpcom/ds/TimeStamp_windows.cpp index 7aee0b57b9c5..1ad0057d6739 100644 --- a/xpcom/ds/TimeStamp_windows.cpp +++ b/xpcom/ds/TimeStamp_windows.cpp @@ -14,7 +14,7 @@ #include #include "nsCRT.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include diff --git a/xpcom/ds/nsExpirationTracker.h b/xpcom/ds/nsExpirationTracker.h index 4fc0ea0acd8a..5570c8d2fbc8 100644 --- a/xpcom/ds/nsExpirationTracker.h +++ b/xpcom/ds/nsExpirationTracker.h @@ -7,7 +7,7 @@ #ifndef NSEXPIRATIONTRACKER_H_ #define NSEXPIRATIONTRACKER_H_ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" #include "nsITimer.h" #include "nsCOMPtr.h" diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp index 1f5ee136856a..41482eb64779 100644 --- a/xpcom/ds/nsObserverService.cpp +++ b/xpcom/ds/nsObserverService.cpp @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsAutoPtr.h" #include "nsIObserverService.h" #include "nsIObserver.h" diff --git a/xpcom/ds/nsStaticAtom.h b/xpcom/ds/nsStaticAtom.h index 7f1c7b3de3dc..2bf96531d205 100644 --- a/xpcom/ds/nsStaticAtom.h +++ b/xpcom/ds/nsStaticAtom.h @@ -9,7 +9,7 @@ #include "nsIAtom.h" #include "nsStringBuffer.h" -#include "prlog.h" +#include "mozilla/Logging.h" typedef char16_t nsStaticAtomStringType; diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/glue/BlockingResourceBase.h index 3407e8dd94d7..6c25007479dc 100644 --- a/xpcom/glue/BlockingResourceBase.h +++ b/xpcom/glue/BlockingResourceBase.h @@ -8,7 +8,7 @@ #ifndef mozilla_BlockingResourceBase_h #define mozilla_BlockingResourceBase_h -#include "prlog.h" +#include "mozilla/Logging.h" #include "nscore.h" #include "nsDebug.h" diff --git a/xpcom/glue/nsStringAPI.h b/xpcom/glue/nsStringAPI.h index d6ee49828766..fa473c8d704a 100644 --- a/xpcom/glue/nsStringAPI.h +++ b/xpcom/glue/nsStringAPI.h @@ -21,7 +21,7 @@ #include "nsXPCOMStrings.h" #include "nsISupportsImpl.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsTArray.h" /** diff --git a/xpcom/glue/nsTextFormatter.cpp b/xpcom/glue/nsTextFormatter.cpp index dc9e7bfd6336..e7b16fd53dd2 100644 --- a/xpcom/glue/nsTextFormatter.cpp +++ b/xpcom/glue/nsTextFormatter.cpp @@ -26,7 +26,7 @@ #include #include #include "prdtoa.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "prprf.h" #include "prmem.h" #include "nsCRTGlue.h" diff --git a/xpcom/io/nsInputStreamTee.cpp b/xpcom/io/nsInputStreamTee.cpp index bd229ee5224e..a382f202ddb1 100644 --- a/xpcom/io/nsInputStreamTee.cpp +++ b/xpcom/io/nsInputStreamTee.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Mutex.h" #include "mozilla/Attributes.h" diff --git a/xpcom/io/nsPipe3.cpp b/xpcom/io/nsPipe3.cpp index 393f5a614e75..8cc8656b5f1f 100644 --- a/xpcom/io/nsPipe3.cpp +++ b/xpcom/io/nsPipe3.cpp @@ -16,7 +16,7 @@ #include "nsStreamUtils.h" #include "nsCOMPtr.h" #include "nsCRT.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIClassInfoImpl.h" #include "nsAlgorithm.h" #include "nsMemory.h" diff --git a/xpcom/io/nsStorageStream.cpp b/xpcom/io/nsStorageStream.cpp index 96bfc134e615..326724e0a664 100644 --- a/xpcom/io/nsStorageStream.cpp +++ b/xpcom/io/nsStorageStream.cpp @@ -21,7 +21,7 @@ #include "nsIInputStream.h" #include "nsIIPCSerializableInputStream.h" #include "nsISeekableStream.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/Attributes.h" #include "mozilla/Likely.h" #include "mozilla/MathAlgorithms.h" diff --git a/xpcom/string/nsSubstring.cpp b/xpcom/string/nsSubstring.cpp index 6c2024e1d490..233de618399e 100644 --- a/xpcom/string/nsSubstring.cpp +++ b/xpcom/string/nsSubstring.cpp @@ -355,7 +355,7 @@ nsStringBuffer::SizeOfIncludingThisEvenIfShared(mozilla::MallocSizeOf aMallocSiz // Check that internal and external strings have the same size. // See https://bugzilla.mozilla.org/show_bug.cgi?id=430581 -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsXPCOMStrings.h" static_assert(sizeof(nsStringContainer_base) == sizeof(nsSubstring), diff --git a/xpcom/threads/nsEventQueue.cpp b/xpcom/threads/nsEventQueue.cpp index 2704ed8ed1ec..c02e156967a9 100644 --- a/xpcom/threads/nsEventQueue.cpp +++ b/xpcom/threads/nsEventQueue.cpp @@ -6,7 +6,7 @@ #include "nsEventQueue.h" #include "nsAutoPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsThreadUtils.h" #include "prthread.h" #include "mozilla/ChaosMode.h" diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp index d6b9df70766d..3a8f3550530d 100644 --- a/xpcom/threads/nsThread.cpp +++ b/xpcom/threads/nsThread.cpp @@ -21,7 +21,7 @@ #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "pratom.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "nsIObserverService.h" #if !defined(MOZILLA_XPCOMRT_API) #include "mozilla/HangMonitor.h" diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 27538fc8e2ba..e61824bca6e9 100644 --- a/xpcom/threads/nsThreadPool.cpp +++ b/xpcom/threads/nsThreadPool.cpp @@ -11,7 +11,7 @@ #include "nsMemory.h" #include "nsAutoPtr.h" #include "prinrval.h" -#include "prlog.h" +#include "mozilla/Logging.h" using namespace mozilla; diff --git a/xpcom/threads/nsTimerImpl.h b/xpcom/threads/nsTimerImpl.h index 640fc90ea35b..3b706e277294 100644 --- a/xpcom/threads/nsTimerImpl.h +++ b/xpcom/threads/nsTimerImpl.h @@ -13,7 +13,7 @@ #include "nsCOMPtr.h" -#include "prlog.h" +#include "mozilla/Logging.h" #include "mozilla/TimeStamp.h" #include "mozilla/Attributes.h"