headers: Stop using the __mingw_static_ovr macro We should prefer using a macro which doesn't declare functions as static inline in C++ mode. This macro was added in bc6a87488995675ae80c312e3585cb1ace739b43, without an explanation of why it was added. Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-headers/crt/_mingw_mac.h b/mingw-w64-headers/crt/_mingw_mac.h index 0186eaf..9de143e 100644 --- a/mingw-w64-headers/crt/_mingw_mac.h +++ b/mingw-w64-headers/crt/_mingw_mac.h
@@ -280,18 +280,14 @@ __attribute__((__format__(gnu_scanf, __format,__args))) #undef __mingw_ovr -#undef __mingw_static_ovr #ifdef __cplusplus # define __mingw_ovr inline __cdecl -# define __mingw_static_ovr static __mingw_ovr #elif defined (__GNUC__) # define __mingw_ovr static \ __attribute__ ((__unused__)) __inline__ __cdecl -# define __mingw_static_ovr __mingw_ovr #else # define __mingw_ovr static __cdecl -# define __mingw_static_ovr __mingw_ovr #endif /* __cplusplus */ #if __MINGW_GNUC_PREREQ(4, 3) || defined(__clang__)
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h index a05eb07..d9fb004 100644 --- a/mingw-w64-headers/crt/stdio.h +++ b/mingw-w64-headers/crt/stdio.h
@@ -661,16 +661,16 @@ _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); #ifdef _UCRT - __mingw_static_ovr int fseeko(FILE *_File, _off_t _Offset, int _Origin) { + __mingw_ovr int fseeko(FILE *_File, _off_t _Offset, int _Origin) { return fseek(_File, _Offset, _Origin); } - __mingw_static_ovr int fseeko64(FILE *_File, _off64_t _Offset, int _Origin) { + __mingw_ovr int fseeko64(FILE *_File, _off64_t _Offset, int _Origin) { return _fseeki64(_File, _Offset, _Origin); } - __mingw_static_ovr _off_t ftello(FILE *_File) { + __mingw_ovr _off_t ftello(FILE *_File) { return ftell(_File); } - __mingw_static_ovr _off64_t ftello64(FILE *_File) { + __mingw_ovr _off64_t ftello64(FILE *_File) { return _ftelli64(_File); } #else