diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:42:30 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:44:08 +0100 |
| commit | 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 (patch) | |
| tree | 101eeda4bf98583d566eeb4b0870d2bde95dea69 /src/scandir_posix.c | |
| parent | 797616841caaf3322c79c15b1d9c74d03b54ea12 (diff) | |
Generate FL/fl_config.h rather than FL/abi-version.h
... as discussed in fltk.coredev in thread "RFC: introduce public
config header <FL/fl_config.h>", see:
https://groups.google.com/g/fltkcoredev/c/xLCs1AIXMVo/m/MHZpQggzAQAJ
- Rename abi-version.h to fl_config.h, rename input files,
update dependencies, .gitignore, CMake, configure and Makefiles.
- Include Cairo options in FL/fl_config.h
- Rename FLTK_USE_CAIRO to FLTK_HAVE_CAIROEXT for consistency.
- Include <FL/fl_config.h> in config.h and wherever necessary,
fix include order (move FL/Fl.H to the top) and more.
- Move USE_X11 to fl_config.h and rename to FLTK_USE_X11
- Do not include <config.h> in Cairo demo program which is no
longer required in Cairo programs since FLTK 1.4.0
Diffstat (limited to 'src/scandir_posix.c')
| -rw-r--r-- | src/scandir_posix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scandir_posix.c b/src/scandir_posix.c index e83a12009..7cdf3cbf5 100644 --- a/src/scandir_posix.c +++ b/src/scandir_posix.c @@ -31,7 +31,7 @@ */ #include <config.h> -#if defined(USE_X11) && !defined(HAVE_SCANDIR) +#if defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) #ifndef HAVE_PTHREAD /* Switch system headers into POSIX.1-1990 mode */ @@ -217,11 +217,11 @@ fl_scandir(const char *dir, struct dirent ***namelist, return result; } -#else /* defined(USE_X11) && !defined(HAVE_SCANDIR) */ +#else /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */ /* avoid (gcc) compiler warning [-Wpedantic] "ISO C forbids an empty translation unit" */ typedef int dummy; -#endif /* defined(USE_X11) && !defined(HAVE_SCANDIR) */ +#endif /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */ |