diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-11-16 13:12:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 13:12:46 +0100 |
| commit | 796a9bf23e63dfc6834b9fd04c10c8c27f894941 (patch) | |
| tree | e05b57eff35ba5434a2ab7d21e370466b53c897f /zlib/gzread.c | |
| parent | af0bb7e6c968a9c51baefbaba9fd3ea59753d545 (diff) | |
| parent | 46cbc31de25b4579801cc783a01e9ce1be4c53a6 (diff) | |
Merge pull request #292 from Albrecht-S/prefix-bundled-libs
Prefix bundled libs. This fixes issues #232 and #289 and STR 3514 (https://www.fltk.org/str.php?L3514).
Parts of this fix are based on the work of GitHub user @darealshinji who provided instructions to create the jpeg header file with prefixes in STR 3347 (https://www.fltk.org/str.php?L3347). Thanks.
Diffstat (limited to 'zlib/gzread.c')
| -rw-r--r-- | zlib/gzread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib/gzread.c b/zlib/gzread.c index 956b91ea7..47445de2a 100644 --- a/zlib/gzread.c +++ b/zlib/gzread.c @@ -440,7 +440,7 @@ z_size_t ZEXPORT gzfread(buf, size, nitems, file) /* -- see zlib.h -- */ #ifdef Z_PREFIX_SET -# undef z_gzgetc +# undef fltk_z_gzgetc /* FLTK */ #else # undef gzgetc #endif |