hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXB_MODULE_NAME must be defined before maxbase/log.h is included

Browse Source 
Otherwise MXB_MODULE_NAME will be NULL.
This commit is contained in:
Johan Wikman
2019-01-31 15:23:32 +02:00
parent b18467e17e
commit 4ee0e9364e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/maxscale/log.hh
View File

@ -20,11 +20,6 @@
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#include <maxbase/log.h>
#include <maxbase/string.hh>
MXS_BEGIN_DECLS
#if !defined (MXS_MODULE_NAME) #if !defined (MXS_MODULE_NAME)
#define MXS_MODULE_NAME NULL #define MXS_MODULE_NAME NULL
#endif #endif
@ -33,6 +28,11 @@ MXS_BEGIN_DECLS
#define MXB_MODULE_NAME MXS_MODULE_NAME #define MXB_MODULE_NAME MXS_MODULE_NAME
#endif #endif
#include <maxbase/log.h>
#include <maxbase/string.hh>
MXS_BEGIN_DECLS
typedef mxb_log_target_t mxs_log_target_t; typedef mxb_log_target_t mxs_log_target_t;
#define MXS_LOG_TARGET_DEFAULT MXB_LOG_TARGET_DEFAULT #define MXS_LOG_TARGET_DEFAULT MXB_LOG_TARGET_DEFAULT
#define MXS_LOG_TARGET_FS MXB_LOG_TARGET_FS #define MXS_LOG_TARGET_FS MXB_LOG_TARGET_FS