From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- xpcom/threads/StateWatching.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'xpcom/threads/StateWatching.h') diff --git a/xpcom/threads/StateWatching.h b/xpcom/threads/StateWatching.h index 3da0c63bfe..2bd5c58d3b 100644 --- a/xpcom/threads/StateWatching.h +++ b/xpcom/threads/StateWatching.h @@ -4,19 +4,19 @@ * 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/. */ -#if !defined(StateWatching_h_) -# define StateWatching_h_ - -# include -# include -# include -# include "mozilla/AbstractThread.h" -# include "mozilla/Assertions.h" -# include "mozilla/Logging.h" -# include "mozilla/RefPtr.h" -# include "nsISupports.h" -# include "nsTArray.h" -# include "nsThreadUtils.h" +#ifndef XPCOM_THREADS_STATEWATCHING_H_ +#define XPCOM_THREADS_STATEWATCHING_H_ + +#include +#include +#include +#include "mozilla/AbstractThread.h" +#include "mozilla/Assertions.h" +#include "mozilla/Logging.h" +#include "mozilla/RefPtr.h" +#include "nsISupports.h" +#include "nsTArray.h" +#include "nsThreadUtils.h" /* * The state-watching machinery automates the process of responding to changes @@ -62,8 +62,8 @@ namespace mozilla { extern LazyLogModule gStateWatchingLog; -# define WATCH_LOG(x, ...) \ - MOZ_LOG(gStateWatchingLog, LogLevel::Debug, (x, ##__VA_ARGS__)) +#define WATCH_LOG(x, ...) \ + MOZ_LOG(gStateWatchingLog, LogLevel::Debug, (x, ##__VA_ARGS__)) /* * AbstractWatcher is a superclass from which all watchers must inherit. @@ -295,7 +295,7 @@ class WatchManager { RefPtr mOwnerThread; }; -# undef WATCH_LOG +#undef WATCH_LOG } // namespace mozilla -- cgit v1.2.3