Skip to content

Commit 25a9f9c

Browse files
committed
linux下定义_MSC_VER宏导致和其他库有冲突
1 parent 11b7544 commit 25a9f9c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

log4z.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ const char*const LOG4Z_MAIN_LOGGER_NAME = "Main";
173173

174174
//! check VC VERSION. DO NOT TOUCH
175175
//! format micro cannot support VC6 or VS2003, please use stream input log, like LOGI, LOGD, LOG_DEBUG, LOG_STREAM ...
176-
#ifndef _MSC_VER
177-
#define _MSC_VER 1400
176+
#if _MSC_VER >= 1400 //MSVC >= VS2005
177+
#define LOG4Z_FORMAT_INPUT_ENABLE
178178
#endif
179-
#if _MSC_VER >= 1400 //gcc or MSVC >= VS2005
179+
180+
#ifndef WIN32
180181
#define LOG4Z_FORMAT_INPUT_ENABLE
181182
#endif
182183

0 commit comments

Comments
 (0)