diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/base/logging.h | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/logging.h')
| -rw-r--r-- | chromium/base/logging.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/base/logging.h b/chromium/base/logging.h index 1b97a4ab2ba..29960599a5c 100644 --- a/chromium/base/logging.h +++ b/chromium/base/logging.h @@ -148,7 +148,7 @@ namespace logging { // TODO(avi): do we want to do a unification of character types here? #if defined(OS_WIN) typedef wchar_t PathChar; -#else +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) typedef char PathChar; #endif @@ -166,7 +166,7 @@ enum LoggingDestination { // stderr. #if defined(OS_WIN) LOG_DEFAULT = LOG_TO_FILE, -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) LOG_DEFAULT = LOG_TO_SYSTEM_DEBUG_LOG, #endif }; @@ -436,7 +436,7 @@ const LogSeverity LOG_0 = LOG_ERROR; #define VPLOG_STREAM(verbose_level) \ ::logging::Win32ErrorLogMessage(__FILE__, __LINE__, -verbose_level, \ ::logging::GetLastSystemErrorCode()).stream() -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #define VPLOG_STREAM(verbose_level) \ ::logging::ErrnoLogMessage(__FILE__, __LINE__, -verbose_level, \ ::logging::GetLastSystemErrorCode()).stream() @@ -459,7 +459,7 @@ const LogSeverity LOG_0 = LOG_ERROR; #define PLOG_STREAM(severity) \ COMPACT_GOOGLE_LOG_EX_ ## severity(Win32ErrorLogMessage, \ ::logging::GetLastSystemErrorCode()).stream() -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) #define PLOG_STREAM(severity) \ COMPACT_GOOGLE_LOG_EX_ ## severity(ErrnoLogMessage, \ ::logging::GetLastSystemErrorCode()).stream() @@ -1050,7 +1050,7 @@ class LogMessageVoidify { #if defined(OS_WIN) typedef unsigned long SystemErrorCode; -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) typedef int SystemErrorCode; #endif @@ -1079,7 +1079,7 @@ class BASE_EXPORT Win32ErrorLogMessage { DISALLOW_COPY_AND_ASSIGN(Win32ErrorLogMessage); }; -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) || defined(OS_FUCHSIA) // Appends a formatted system message of the errno type class BASE_EXPORT ErrnoLogMessage { public: |