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
---
src/socket/mod_socket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/socket/mod_socket.c b/src/socket/mod_socket.c
index 7629621..b5a686a 100644
--- a/src/socket/mod_socket.c
+++ b/src/socket/mod_socket.c
@@ -7,7 +7,7 @@
#include "sem_util.h"
#include "logger_factory.h"
-static Logger logger = LoggerFactory::getLogger();
+static Logger *logger = LoggerFactory::getLogger();
typedef struct mod_entry_t
{
--
Gitblit v1.8.0