From 717a7d266b629233255ae0816c5eac8832bd17fb Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 3 Apr 2022 20:10:08 +0200 Subject: Remove '#include ' from FL/platform_types.h - Add this include statement only where needed. - Rename Fl_System_Driver::stat() to flstat(). This fixes an issue when using some (!) MinGW 64-bit build systems that obviously '#define stat _stat64' or similar. This would result in compiler problems if 'stat()' is a member function of Fl_System_Driver. --- src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 2 +- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index 27e2e5739..9855ba509 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -54,7 +54,7 @@ public: virtual int execvp(const char *file, char *const *argv); virtual int chmod(const char *fnam, int mode); virtual int access(const char *fnam, int mode); - virtual int stat(const char *fnam, struct stat *b); + virtual int flstat(const char *fnam, struct stat *b); virtual char *getcwd(char *b, int l); virtual int chdir(const char *path); virtual int unlink(const char *fnam); diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index b6a435d02..cc6aede08 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -243,7 +243,7 @@ int Fl_WinAPI_System_Driver::access(const char *fnam, int mode) { return _waccess(utf8_to_wchar(fnam, wbuf), mode); } -int Fl_WinAPI_System_Driver::stat(const char *fnam, struct stat *b) { +int Fl_WinAPI_System_Driver::flstat(const char *fnam, struct stat *b) { // remove trailing '/' or '\' unsigned len = (unsigned)strlen(fnam); -- cgit v1.2.3