From dcb1a8a5660ef170f4b79b6491acab961572712b Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Fri, 9 Nov 2018 13:40:06 +0800 Subject: [PATCH] Update DStarGateway Global Defs --- Common/Defs.h | 1 + GlobalDefines.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Common/Defs.h b/Common/Defs.h index f2c5c31..ca9d950 100644 --- a/Common/Defs.h +++ b/Common/Defs.h @@ -20,6 +20,7 @@ #define Defs_H #include +#include "../GlobalDefines.h" const wxString DEXTRA_HOSTS_FILE_NAME = wxT("DExtra_Hosts.txt"); const wxString DPLUS_HOSTS_FILE_NAME = wxT("DPlus_Hosts.txt"); diff --git a/GlobalDefines.h b/GlobalDefines.h index c5317a5..fbfa10b 100644 --- a/GlobalDefines.h +++ b/GlobalDefines.h @@ -6,21 +6,18 @@ #define LOG_DIR "/opt/mmdvm/logs" #define CONF_DIR "/opt/mmdvm/conf" #define CONF_FILE "ircDDBGateway.ini" -#define LOG_BASE "ircDDBGateway" #elif defined(OPENWRT) && OPENWRT == 1 #define DATA_DIR "/etc/mmdvm/dstar" #define LOG_DIR "/var/log/mmdvm" #define CONF_DIR "/etc" #define CONF_FILE "ircDDBGateway.ini" -#define LOG_BASE "ircDDBGateway" #else #define DATA_DIR "/usr/share/ircddbgateway" #define LOG_DIR "/tmp" #define CONF_DIR "/etc" #define CONF_FILE "ircddbgateway" -#define LOG_BASE "ircddbgatewayd" #endif