>From ff3e4348a8309e81637414ac72584196b6438901 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 Aug 2020 13:00:38 +0200 Subject: [PATCH 04/13] Fix "warning: '__stat64' macro redefined". * lib/glob.c (__stat64): Undefine also on MSVC/clang. --- ChangeLog | 3 +++ lib/glob.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index af210cc..f08d762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2020-08-16 Bruno Haible + Fix "warning: '__stat64' macro redefined". + * lib/glob.c (__stat64): Undefine also on MSVC/clang. + Fix "warning: 'format' attribute argument not supported: rpl_printf". * lib/stdio.in.h (printf): Treat clang like GCC. diff --git a/lib/glob.c b/lib/glob.c index add5d93..32e2e11 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -72,8 +72,8 @@ # define __glob glob # define __getlogin_r(buf, len) getlogin_r (buf, len) # define __lstat64(fname, buf) lstat (fname, buf) -# ifdef __MINGW32__ - /* Avoid GCC warning. mingw has an unused __stat64 macro. */ +# if defined _WIN32 && !defined __CYGWIN__ + /* Avoid GCC or clang warning. The original __stat64 macro is unused. */ # undef __stat64 # endif # define __stat64(fname, buf) stat (fname, buf) -- 2.7.4