From c41b3a1a647155ab9c727dab168baf08e7609372 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 11 Oct 2023 22:26:36 +0100 Subject: Fixes fl_filename_relative on Linux, Mac, and Windows (#787) * fixed filename_relative for Linux * Fixing fl_filename_relative for MSWindows. * Update documentation * Fixed docs. * Fixes Linux and macOS builds --- FL/filename.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'FL') diff --git a/FL/filename.H b/FL/filename.H index be7e90ead..b5b76f92f 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -62,8 +62,10 @@ FL_EXPORT Fl_String fl_filename_path(const Fl_String &filename); FL_EXPORT Fl_String fl_filename_ext(const Fl_String &filename); FL_EXPORT Fl_String fl_filename_setext(const Fl_String &filename, const Fl_String &new_extension); FL_EXPORT Fl_String fl_filename_expand(const Fl_String &from); +FL_EXPORT int fl_filename_absolute(char *to, int tolen, const char *from, const char *cwd); FL_EXPORT Fl_String fl_filename_absolute(const Fl_String &from); FL_EXPORT Fl_String fl_filename_absolute(const Fl_String &from, const Fl_String &base); +FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from, const char *cwd); FL_EXPORT Fl_String fl_filename_relative(const Fl_String &from); FL_EXPORT Fl_String fl_filename_relative(const Fl_String &from, const Fl_String &base); FL_EXPORT Fl_String fl_getcwd(); @@ -77,9 +79,7 @@ FL_EXPORT Fl_String fl_getcwd(); inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); } inline int fl_filename_expand(char *to, const char *from) { return fl_filename_expand(to, FL_PATH_MAX, from); } -FL_EXPORT int fl_filename_absolute(char *to, int tolen, const char *from, const char *cwd); inline int fl_filename_absolute(char *to, const char *from) { return fl_filename_absolute(to, FL_PATH_MAX, from); } -FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from, const char *cwd); inline int fl_filename_relative(char *to, const char *from) { return fl_filename_relative(to, FL_PATH_MAX, from); } # endif /* __cplusplus */ -- cgit v1.2.3