From 5d0308e79a5dff5b040504a17c6300bafdeb1499 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 30 十月 2020 09:36:41 +0800
Subject: [PATCH] fix conflict
---
include/usgcommon/logger.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/usgcommon/logger.h b/include/usgcommon/logger.h
index a735086..52859ce 100644
--- a/include/usgcommon/logger.h
+++ b/include/usgcommon/logger.h
@@ -22,7 +22,7 @@
struct timeval tv;
struct tm *info;
gettimeofday(&tv, NULL);
- info = localtime(&tv.tv_sec);
+ info = localtime(&(tv.tv_sec));
strftime(buf, MAXBUF - 1, "%Y-%d-%m %H:%M:%S", info);
snprintf(buf + strlen(buf), MAXBUF - strlen(buf) - 1, ",%ld [%s] ", tv.tv_usec, strlevel(level));
vsnprintf(buf + strlen(buf), MAXBUF - strlen(buf) - 1, fmt, ap);
--
Gitblit v1.8.0