fix: stat conflict with MinGW definitions

Author: tangxinfa

src/conf.c

@@ -37,12 +37,6 @@
 #include "rotater.h"
 #include "zc_defs.h"
 
-#ifdef _WIN32
-#define STATS_FILE stat
-#else
-#define STATS_FILE lstat
-#endif
-
 /*******************************************************************************/
 #define ZLOG_CONF_DEFAULT_FORMAT "default = \"%D %V [%p:%F:%L] %m%n\""
 #define ZLOG_CONF_DEFAULT_RULE "*.*        >stdout"
@@ -456,7 +450,7 @@ static int zlog_conf_build_with_string(zlog_conf_t *a_conf,
 static int zlog_conf_build_with_file(zlog_conf_t * a_conf)
 {
 	int rc = 0;
-	struct zlog_stat a_stat;
+	struct zlog_stat_t a_stat;
 	struct tm local_time;
 	FILE *fp = NULL;
 
@@ -471,7 +465,7 @@ static int zlog_conf_build_with_file(zlog_conf_t * a_conf)
 	int section = 0;
 	/* [global:1] [levels:2] [formats:3] [rules:4] */
 
-	if (STATS_FILE(a_conf->file, &a_stat)) {
+	if (zlog_stat(a_conf->file, &a_stat)) {
 		zc_error("lstat conf file[%s] fail, errno[%d]", a_conf->file,
 			 errno);
 		return -1;

src/rotater.c

@@ -509,7 +509,7 @@ int zlog_rotater_rotate(zlog_rotater_t *a_rotater,
 		char *archive_path, long archive_max_size, int archive_max_count)
 {
 	int rc = 0;
-	struct zlog_stat info;
+	struct zlog_stat_t info;
 
 	zc_assert(base_path, -1);
 

src/rule.c

@@ -171,7 +171,7 @@ static char * zlog_rule_gen_archive_path(zlog_rule_t *a_rule, zlog_thread_t *a_t
 static int zlog_rule_output_static_file_rotate(zlog_rule_t * a_rule, zlog_thread_t * a_thread)
 {
 	size_t len;
-	struct zlog_stat info;
+	struct zlog_stat_t info;
 	int fd;
 
 	if (zlog_format_gen_msg(a_rule->format, a_thread)) {
@@ -291,7 +291,7 @@ static int zlog_rule_output_dynamic_file_rotate(zlog_rule_t * a_rule, zlog_threa
 	int fd;
 	char *path;
 	size_t len;
-	struct zlog_stat info;
+	struct zlog_stat_t info;
 
 	zlog_rule_gen_path(a_rule, a_thread);
 

src/version.h

@@ -1 +1 @@
-#define ZLOG_VERSION "1.2.12"
+#define ZLOG_VERSION "1.2.18"

src/zc_xplatform.h

@@ -52,12 +52,15 @@
 #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
 #define zlog_fstat fstat64
 #define zlog_stat stat64
+#define zlog_stat_t stat64
 #elif defined(_WIN32)
 #define zlog_fstat _fstat
 #define zlog_stat _stat
+#define zlog_stat_t _stat
 #else
 #define zlog_fstat fstat
 #define zlog_stat stat
+#define zlog_stat_t stat
 #endif
 
 /* Define zlog_fsync to fdatasync() in Linux and fsync() for all the rest */