diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-04-03 20:10:08 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-04-03 22:01:41 +0200 |
| commit | 717a7d266b629233255ae0816c5eac8832bd17fb (patch) | |
| tree | d757c34696644eed2d9de711fc00dc64619ee6b6 /src | |
| parent | 9aba7c9db05bde2acb67f838c075d75d62fad39c (diff) | |
Remove '#include <sys/stat.h>' 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_System_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/fl_utf8.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H index d008f6a26..b342fcb29 100644 --- a/src/Fl_System_Driver.H +++ b/src/Fl_System_Driver.H @@ -112,7 +112,7 @@ public: virtual int execvp(const char * /*file*/, char *const * /*argv*/) {return -1;} virtual int chmod(const char* /*f*/, int /*mode*/) {return -1;} virtual int access(const char* /*f*/, int /*mode*/) { return -1;} - virtual int stat(const char* /*f*/, struct stat *) { return -1;} + virtual int flstat(const char* /*f*/, struct stat *) { return -1;} virtual char *getcwd(char* /*b*/, int /*l*/) {return NULL;} virtual int chdir(const char*) {return -1;} virtual int unlink(const char*) {return -1;} 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); diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx index b7d273466..efb7fa5d5 100644 --- a/src/fl_utf8.cxx +++ b/src/fl_utf8.cxx @@ -3,7 +3,7 @@ // // Author: Jean-Marc Lienher ( http://oksid.ch ) // Copyright 2000-2010 by O'ksi'D. -// Copyright 2016-2020 by Bill Spitzak and others. +// Copyright 2016-2022 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -462,7 +462,7 @@ int fl_access(const char* f, int mode) { \return the return value of _wstat() on Windows or stat() on other platforms. */ int fl_stat(const char* f, struct stat *b) { - return Fl::system_driver()->stat(f, b); + return Fl::system_driver()->flstat(f, b); } /** Cross-platform function to change the current working directory, |
