Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Unified Diff: util/win/ntstatus_logging.h

Issue 1426493002: win: Fix NTSTATUS_LOG for no-function arg version of COMPACT_GOOGLE_LOG_EX_ (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | util/win/ntstatus_logging.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/win/ntstatus_logging.h
diff --git a/util/win/ntstatus_logging.h b/util/win/ntstatus_logging.h
index f52fa1bd8de3b6560640998a059d46a36d78ddbd..0dc24601df2f98d4eac8e7719b00abe21eec8a86 100644
--- a/util/win/ntstatus_logging.h
+++ b/util/win/ntstatus_logging.h
@@ -24,11 +24,14 @@ namespace logging {
class NtstatusLogMessage : public logging::LogMessage {
public:
- NtstatusLogMessage(const char* function,
- const char* file_path,
- int line,
- LogSeverity severity,
- DWORD ntstatus);
+ NtstatusLogMessage(
+#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
+ const char* function,
+#endif
+ const char* file_path,
+ int line,
+ LogSeverity severity,
+ DWORD ntstatus);
~NtstatusLogMessage();
private:
@@ -41,11 +44,22 @@ class NtstatusLogMessage : public logging::LogMessage {
#define NTSTATUS_LOG_STREAM(severity, ntstatus) \
COMPACT_GOOGLE_LOG_EX_##severity(NtstatusLogMessage, ntstatus).stream()
+
+#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
+
#define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus) \
logging::NtstatusLogMessage( \
__PRETTY_FUNCTION__, __FILE__, __LINE__, -verbose_level, ntstatus) \
.stream()
+#else
+
+#define NTSTATUS_VLOG_STREAM(verbose_level, ntstatus) \
+ logging::NtstatusLogMessage(__FILE__, __LINE__, -verbose_level, ntstatus) \
+ .stream()
+
+#endif // MINI_CHROMIUM_BASE_LOGGING_H_
+
#define NTSTATUS_LOG(severity, ntstatus) \
LAZY_STREAM(NTSTATUS_LOG_STREAM(severity, ntstatus), LOG_IS_ON(severity))
#define NTSTATUS_LOG_IF(severity, condition, ntstatus) \
« no previous file with comments | « no previous file | util/win/ntstatus_logging.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698