From ee2a290abf16f4fd4736c2f4e17e9cff87f50447 Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周一, 22 4月 2019 01:58:13 +0800
Subject: [PATCH] fix gcc 5.4 warnings
---
src/library/base/logger.h | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/library/base/logger.h b/src/library/base/logger.h
index a35afd6..0803685 100644
--- a/src/library/base/logger.h
+++ b/src/library/base/logger.h
@@ -3,16 +3,20 @@
#ifndef LOG_ENABLED
#include <errno.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define clean_errno() (errno == 0 ? "None" : strerror(errno))
-#ifdef NDEBUG
-#define LOG_DEBUG(M, ...) _log("[INFO] %s (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+#ifdef _DEBUG
+#define LOG_DEBUG(M, ...) _log("[DEBUG] (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
#else
#define LOG_DEBUG(M,...)
#endif
-#define LOG_INFO(M, ...) _log("[INFO] %s (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
-#define LOG_WARN(M, ...) _log("[WARN] %s (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
-#define LOG_ERROR(M, ...) _log("[ERROR] %s (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
+#define LOG_INFO(M, ...) _log("[INFO] (%s:%d) " M "\n", __FILE__, __LINE__, ##__VA_ARGS__)
+#define LOG_WARN(M, ...) _log("[WARN] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
+#define LOG_ERROR(M, ...) _log("[ERROR] (%s:%d: errno: %s) " M "\n", __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
#else
#define LOG_DEBUG(M,...)
@@ -21,6 +25,10 @@
#define LOG_ERROR(M, ...)
#endif
-void _log(char* format, ...);
+void _log(const char* format, ...);
void _shutdown_log();
+
+#ifdef __cplusplus
+}
+#endif
#endif
--
Gitblit v1.9.1