diff --git a/README.bundled-libs.txt b/README.bundled-libs.txt index c9dff1455..10b91addd 100644 --- a/README.bundled-libs.txt +++ b/README.bundled-libs.txt @@ -29,9 +29,9 @@ Previous versions of bundled libraries: Library Version Release date FLTK Version ------------------------------------------------------------------ - jpeg jpeg-9d 2020-01-12 1.3.6 - png libpng-1.6.37 2019-04-14 1.3.6 - zlib zlib-1.2.11 2017-01-15 1.3.6 + jpeg jpeg-9d 2020-01-12 1.3.6 - 1.3.8 + png libpng-1.6.37 2019-04-14 1.3.6 - 1.3.8 + zlib zlib-1.2.11 2017-01-15 1.3.6 - 1.3.8 -------------------------------------------------------------------------- @@ -128,6 +128,27 @@ zlib: Download: See website and follow links. Repository: git clone https://github.com/madler/zlib.git + zlib should be upgraded first because libpng depends on zlib. + + Download the latest zlib sources, `cd' to /path-to/zlib and run + + $ ./configure --zprefix + + This creates the header file 'zconf.h' with definitions to enable + the standard 'z_' symbol prefix. + + Unfortunately zlib requires patching some source and header files to + convert this 'z_' prefix to 'fltk_z_' to be more specific. As of this + writing (Nov. 2021) three files need symbol prefix patches: + + - gzread.c + - zconf.h + - zlib.h + + You may want to compare these files and/or the previous version to + find out which changes are required. The general rule is to change + all occurrences of 'z_' to 'fltk_z_' but there *are* exceptions. + The following files need special handling: @@ -135,10 +156,9 @@ zlib: Makefile: Same as CMakeLists.txt. - zconf.h: Merge changes. - - As of zlib 1.2.11: two small sections marked with "FLTK" comments - that need to be kept. + gzread.c: Merge changes (see above, manual merge recommended). + zconf.h: Merge changes (see above, manual merge recommended). + zlib.h: Merge changes (see above, manual merge recommended). makedepend: Keep this file. diff --git a/jpeg/makedepend b/jpeg/makedepend index 1738565ed..d211cb0b8 100644 --- a/jpeg/makedepend +++ b/jpeg/makedepend @@ -1,41 +1,48 @@ # DO NOT DELETE THIS LINE -- make depend depends on it. +jaricom.o: fltk_jpeg_prefix.h jaricom.o: jconfig.h jaricom.o: jerror.h jaricom.o: jinclude.h jaricom.o: jmorecfg.h jaricom.o: jpegint.h jaricom.o: jpeglib.h +jcapimin.o: fltk_jpeg_prefix.h jcapimin.o: jconfig.h jcapimin.o: jerror.h jcapimin.o: jinclude.h jcapimin.o: jmorecfg.h jcapimin.o: jpegint.h jcapimin.o: jpeglib.h +jcapistd.o: fltk_jpeg_prefix.h jcapistd.o: jconfig.h jcapistd.o: jerror.h jcapistd.o: jinclude.h jcapistd.o: jmorecfg.h jcapistd.o: jpegint.h jcapistd.o: jpeglib.h +jcarith.o: fltk_jpeg_prefix.h jcarith.o: jconfig.h jcarith.o: jerror.h jcarith.o: jinclude.h jcarith.o: jmorecfg.h jcarith.o: jpegint.h jcarith.o: jpeglib.h +jccoefct.o: fltk_jpeg_prefix.h jccoefct.o: jconfig.h jccoefct.o: jerror.h jccoefct.o: jinclude.h jccoefct.o: jmorecfg.h jccoefct.o: jpegint.h jccoefct.o: jpeglib.h +jccolor.o: fltk_jpeg_prefix.h jccolor.o: jconfig.h jccolor.o: jerror.h jccolor.o: jinclude.h jccolor.o: jmorecfg.h jccolor.o: jpegint.h jccolor.o: jpeglib.h +jcdctmgr.o: fltk_jpeg_prefix.h jcdctmgr.o: jconfig.h jcdctmgr.o: jdct.h jcdctmgr.o: jerror.h @@ -43,108 +50,126 @@ jcdctmgr.o: jinclude.h jcdctmgr.o: jmorecfg.h jcdctmgr.o: jpegint.h jcdctmgr.o: jpeglib.h +jchuff.o: fltk_jpeg_prefix.h jchuff.o: jconfig.h jchuff.o: jerror.h jchuff.o: jinclude.h jchuff.o: jmorecfg.h jchuff.o: jpegint.h jchuff.o: jpeglib.h +jcinit.o: fltk_jpeg_prefix.h jcinit.o: jconfig.h jcinit.o: jerror.h jcinit.o: jinclude.h jcinit.o: jmorecfg.h jcinit.o: jpegint.h jcinit.o: jpeglib.h +jcmainct.o: fltk_jpeg_prefix.h jcmainct.o: jconfig.h jcmainct.o: jerror.h jcmainct.o: jinclude.h jcmainct.o: jmorecfg.h jcmainct.o: jpegint.h jcmainct.o: jpeglib.h +jcmarker.o: fltk_jpeg_prefix.h jcmarker.o: jconfig.h jcmarker.o: jerror.h jcmarker.o: jinclude.h jcmarker.o: jmorecfg.h jcmarker.o: jpegint.h jcmarker.o: jpeglib.h +jcmaster.o: fltk_jpeg_prefix.h jcmaster.o: jconfig.h jcmaster.o: jerror.h jcmaster.o: jinclude.h jcmaster.o: jmorecfg.h jcmaster.o: jpegint.h jcmaster.o: jpeglib.h +jcomapi.o: fltk_jpeg_prefix.h jcomapi.o: jconfig.h jcomapi.o: jerror.h jcomapi.o: jinclude.h jcomapi.o: jmorecfg.h jcomapi.o: jpegint.h jcomapi.o: jpeglib.h +jcparam.o: fltk_jpeg_prefix.h jcparam.o: jconfig.h jcparam.o: jerror.h jcparam.o: jinclude.h jcparam.o: jmorecfg.h jcparam.o: jpegint.h jcparam.o: jpeglib.h +jcprepct.o: fltk_jpeg_prefix.h jcprepct.o: jconfig.h jcprepct.o: jerror.h jcprepct.o: jinclude.h jcprepct.o: jmorecfg.h jcprepct.o: jpegint.h jcprepct.o: jpeglib.h +jcsample.o: fltk_jpeg_prefix.h jcsample.o: jconfig.h jcsample.o: jerror.h jcsample.o: jinclude.h jcsample.o: jmorecfg.h jcsample.o: jpegint.h jcsample.o: jpeglib.h +jctrans.o: fltk_jpeg_prefix.h jctrans.o: jconfig.h jctrans.o: jerror.h jctrans.o: jinclude.h jctrans.o: jmorecfg.h jctrans.o: jpegint.h jctrans.o: jpeglib.h +jdapimin.o: fltk_jpeg_prefix.h jdapimin.o: jconfig.h jdapimin.o: jerror.h jdapimin.o: jinclude.h jdapimin.o: jmorecfg.h jdapimin.o: jpegint.h jdapimin.o: jpeglib.h +jdapistd.o: fltk_jpeg_prefix.h jdapistd.o: jconfig.h jdapistd.o: jerror.h jdapistd.o: jinclude.h jdapistd.o: jmorecfg.h jdapistd.o: jpegint.h jdapistd.o: jpeglib.h +jdarith.o: fltk_jpeg_prefix.h jdarith.o: jconfig.h jdarith.o: jerror.h jdarith.o: jinclude.h jdarith.o: jmorecfg.h jdarith.o: jpegint.h jdarith.o: jpeglib.h +jdatadst.o: fltk_jpeg_prefix.h jdatadst.o: jconfig.h jdatadst.o: jerror.h jdatadst.o: jinclude.h jdatadst.o: jmorecfg.h jdatadst.o: jpegint.h jdatadst.o: jpeglib.h +jdatasrc.o: fltk_jpeg_prefix.h jdatasrc.o: jconfig.h jdatasrc.o: jerror.h jdatasrc.o: jinclude.h jdatasrc.o: jmorecfg.h jdatasrc.o: jpegint.h jdatasrc.o: jpeglib.h +jdcoefct.o: fltk_jpeg_prefix.h jdcoefct.o: jconfig.h jdcoefct.o: jerror.h jdcoefct.o: jinclude.h jdcoefct.o: jmorecfg.h jdcoefct.o: jpegint.h jdcoefct.o: jpeglib.h +jdcolor.o: fltk_jpeg_prefix.h jdcolor.o: jconfig.h jdcolor.o: jerror.h jdcolor.o: jinclude.h jdcolor.o: jmorecfg.h jdcolor.o: jpegint.h jdcolor.o: jpeglib.h +jddctmgr.o: fltk_jpeg_prefix.h jddctmgr.o: jconfig.h jddctmgr.o: jdct.h jddctmgr.o: jerror.h @@ -152,60 +177,70 @@ jddctmgr.o: jinclude.h jddctmgr.o: jmorecfg.h jddctmgr.o: jpegint.h jddctmgr.o: jpeglib.h +jdhuff.o: fltk_jpeg_prefix.h jdhuff.o: jconfig.h jdhuff.o: jerror.h jdhuff.o: jinclude.h jdhuff.o: jmorecfg.h jdhuff.o: jpegint.h jdhuff.o: jpeglib.h +jdinput.o: fltk_jpeg_prefix.h jdinput.o: jconfig.h jdinput.o: jerror.h jdinput.o: jinclude.h jdinput.o: jmorecfg.h jdinput.o: jpegint.h jdinput.o: jpeglib.h +jdmainct.o: fltk_jpeg_prefix.h jdmainct.o: jconfig.h jdmainct.o: jerror.h jdmainct.o: jinclude.h jdmainct.o: jmorecfg.h jdmainct.o: jpegint.h jdmainct.o: jpeglib.h +jdmarker.o: fltk_jpeg_prefix.h jdmarker.o: jconfig.h jdmarker.o: jerror.h jdmarker.o: jinclude.h jdmarker.o: jmorecfg.h jdmarker.o: jpegint.h jdmarker.o: jpeglib.h +jdmaster.o: fltk_jpeg_prefix.h jdmaster.o: jconfig.h jdmaster.o: jerror.h jdmaster.o: jinclude.h jdmaster.o: jmorecfg.h jdmaster.o: jpegint.h jdmaster.o: jpeglib.h +jdmerge.o: fltk_jpeg_prefix.h jdmerge.o: jconfig.h jdmerge.o: jerror.h jdmerge.o: jinclude.h jdmerge.o: jmorecfg.h jdmerge.o: jpegint.h jdmerge.o: jpeglib.h +jdpostct.o: fltk_jpeg_prefix.h jdpostct.o: jconfig.h jdpostct.o: jerror.h jdpostct.o: jinclude.h jdpostct.o: jmorecfg.h jdpostct.o: jpegint.h jdpostct.o: jpeglib.h +jdsample.o: fltk_jpeg_prefix.h jdsample.o: jconfig.h jdsample.o: jerror.h jdsample.o: jinclude.h jdsample.o: jmorecfg.h jdsample.o: jpegint.h jdsample.o: jpeglib.h +jdtrans.o: fltk_jpeg_prefix.h jdtrans.o: jconfig.h jdtrans.o: jerror.h jdtrans.o: jinclude.h jdtrans.o: jmorecfg.h jdtrans.o: jpegint.h jdtrans.o: jpeglib.h +jerror.o: fltk_jpeg_prefix.h jerror.o: jconfig.h jerror.o: jerror.h jerror.o: jinclude.h @@ -213,6 +248,7 @@ jerror.o: jmorecfg.h jerror.o: jpegint.h jerror.o: jpeglib.h jerror.o: jversion.h +jfdctflt.o: fltk_jpeg_prefix.h jfdctflt.o: jconfig.h jfdctflt.o: jdct.h jfdctflt.o: jerror.h @@ -220,6 +256,7 @@ jfdctflt.o: jinclude.h jfdctflt.o: jmorecfg.h jfdctflt.o: jpegint.h jfdctflt.o: jpeglib.h +jfdctfst.o: fltk_jpeg_prefix.h jfdctfst.o: jconfig.h jfdctfst.o: jdct.h jfdctfst.o: jerror.h @@ -227,6 +264,7 @@ jfdctfst.o: jinclude.h jfdctfst.o: jmorecfg.h jfdctfst.o: jpegint.h jfdctfst.o: jpeglib.h +jfdctint.o: fltk_jpeg_prefix.h jfdctint.o: jconfig.h jfdctint.o: jdct.h jfdctint.o: jerror.h @@ -234,6 +272,7 @@ jfdctint.o: jinclude.h jfdctint.o: jmorecfg.h jfdctint.o: jpegint.h jfdctint.o: jpeglib.h +jidctflt.o: fltk_jpeg_prefix.h jidctflt.o: jconfig.h jidctflt.o: jdct.h jidctflt.o: jerror.h @@ -241,6 +280,7 @@ jidctflt.o: jinclude.h jidctflt.o: jmorecfg.h jidctflt.o: jpegint.h jidctflt.o: jpeglib.h +jidctfst.o: fltk_jpeg_prefix.h jidctfst.o: jconfig.h jidctfst.o: jdct.h jidctfst.o: jerror.h @@ -248,6 +288,7 @@ jidctfst.o: jinclude.h jidctfst.o: jmorecfg.h jidctfst.o: jpegint.h jidctfst.o: jpeglib.h +jidctint.o: fltk_jpeg_prefix.h jidctint.o: jconfig.h jidctint.o: jdct.h jidctint.o: jerror.h @@ -255,6 +296,7 @@ jidctint.o: jinclude.h jidctint.o: jmorecfg.h jidctint.o: jpegint.h jidctint.o: jpeglib.h +jmemmgr.o: fltk_jpeg_prefix.h jmemmgr.o: jconfig.h jmemmgr.o: jerror.h jmemmgr.o: jinclude.h @@ -262,6 +304,7 @@ jmemmgr.o: jmemsys.h jmemmgr.o: jmorecfg.h jmemmgr.o: jpegint.h jmemmgr.o: jpeglib.h +jmemnobs.o: fltk_jpeg_prefix.h jmemnobs.o: jconfig.h jmemnobs.o: jerror.h jmemnobs.o: jinclude.h @@ -269,18 +312,21 @@ jmemnobs.o: jmemsys.h jmemnobs.o: jmorecfg.h jmemnobs.o: jpegint.h jmemnobs.o: jpeglib.h +jquant1.o: fltk_jpeg_prefix.h jquant1.o: jconfig.h jquant1.o: jerror.h jquant1.o: jinclude.h jquant1.o: jmorecfg.h jquant1.o: jpegint.h jquant1.o: jpeglib.h +jquant2.o: fltk_jpeg_prefix.h jquant2.o: jconfig.h jquant2.o: jerror.h jquant2.o: jinclude.h jquant2.o: jmorecfg.h jquant2.o: jpegint.h jquant2.o: jpeglib.h +jutils.o: fltk_jpeg_prefix.h jutils.o: jconfig.h jutils.o: jerror.h jutils.o: jinclude.h diff --git a/png/makedepend b/png/makedepend index b480d32d7..b623bccf6 100644 --- a/png/makedepend +++ b/png/makedepend @@ -5,6 +5,7 @@ arm/arm_init.o: pngconf.h arm/arm_init.o: pngdebug.h arm/arm_init.o: pnginfo.h arm/arm_init.o: pnglibconf.h +arm/arm_init.o: pngprefix.h arm/arm_init.o: pngpriv.h arm/arm_init.o: pngstruct.h arm/filter_neon_intrinsics.o: png.h @@ -12,6 +13,7 @@ arm/filter_neon_intrinsics.o: pngconf.h arm/filter_neon_intrinsics.o: pngdebug.h arm/filter_neon_intrinsics.o: pnginfo.h arm/filter_neon_intrinsics.o: pnglibconf.h +arm/filter_neon_intrinsics.o: pngprefix.h arm/filter_neon_intrinsics.o: pngpriv.h arm/filter_neon_intrinsics.o: pngstruct.h arm/palette_neon_intrinsics.o: png.h @@ -19,6 +21,7 @@ arm/palette_neon_intrinsics.o: pngconf.h arm/palette_neon_intrinsics.o: pngdebug.h arm/palette_neon_intrinsics.o: pnginfo.h arm/palette_neon_intrinsics.o: pnglibconf.h +arm/palette_neon_intrinsics.o: pngprefix.h arm/palette_neon_intrinsics.o: pngpriv.h arm/palette_neon_intrinsics.o: pngstruct.h png.o: png.h @@ -26,6 +29,7 @@ png.o: pngconf.h png.o: pngdebug.h png.o: pnginfo.h png.o: pnglibconf.h +png.o: pngprefix.h png.o: pngpriv.h png.o: pngstruct.h pngerror.o: png.h @@ -33,6 +37,7 @@ pngerror.o: pngconf.h pngerror.o: pngdebug.h pngerror.o: pnginfo.h pngerror.o: pnglibconf.h +pngerror.o: pngprefix.h pngerror.o: pngpriv.h pngerror.o: pngstruct.h pngget.o: png.h @@ -40,6 +45,7 @@ pngget.o: pngconf.h pngget.o: pngdebug.h pngget.o: pnginfo.h pngget.o: pnglibconf.h +pngget.o: pngprefix.h pngget.o: pngpriv.h pngget.o: pngstruct.h pngmem.o: png.h @@ -47,6 +53,7 @@ pngmem.o: pngconf.h pngmem.o: pngdebug.h pngmem.o: pnginfo.h pngmem.o: pnglibconf.h +pngmem.o: pngprefix.h pngmem.o: pngpriv.h pngmem.o: pngstruct.h pngpread.o: png.h @@ -54,6 +61,7 @@ pngpread.o: pngconf.h pngpread.o: pngdebug.h pngpread.o: pnginfo.h pngpread.o: pnglibconf.h +pngpread.o: pngprefix.h pngpread.o: pngpriv.h pngpread.o: pngstruct.h pngread.o: png.h @@ -61,6 +69,7 @@ pngread.o: pngconf.h pngread.o: pngdebug.h pngread.o: pnginfo.h pngread.o: pnglibconf.h +pngread.o: pngprefix.h pngread.o: pngpriv.h pngread.o: pngstruct.h pngrio.o: png.h @@ -68,6 +77,7 @@ pngrio.o: pngconf.h pngrio.o: pngdebug.h pngrio.o: pnginfo.h pngrio.o: pnglibconf.h +pngrio.o: pngprefix.h pngrio.o: pngpriv.h pngrio.o: pngstruct.h pngrtran.o: png.h @@ -75,6 +85,7 @@ pngrtran.o: pngconf.h pngrtran.o: pngdebug.h pngrtran.o: pnginfo.h pngrtran.o: pnglibconf.h +pngrtran.o: pngprefix.h pngrtran.o: pngpriv.h pngrtran.o: pngstruct.h pngrutil.o: png.h @@ -82,6 +93,7 @@ pngrutil.o: pngconf.h pngrutil.o: pngdebug.h pngrutil.o: pnginfo.h pngrutil.o: pnglibconf.h +pngrutil.o: pngprefix.h pngrutil.o: pngpriv.h pngrutil.o: pngstruct.h pngset.o: png.h @@ -89,6 +101,7 @@ pngset.o: pngconf.h pngset.o: pngdebug.h pngset.o: pnginfo.h pngset.o: pnglibconf.h +pngset.o: pngprefix.h pngset.o: pngpriv.h pngset.o: pngstruct.h pngtrans.o: png.h @@ -96,6 +109,7 @@ pngtrans.o: pngconf.h pngtrans.o: pngdebug.h pngtrans.o: pnginfo.h pngtrans.o: pnglibconf.h +pngtrans.o: pngprefix.h pngtrans.o: pngpriv.h pngtrans.o: pngstruct.h pngwio.o: png.h @@ -103,6 +117,7 @@ pngwio.o: pngconf.h pngwio.o: pngdebug.h pngwio.o: pnginfo.h pngwio.o: pnglibconf.h +pngwio.o: pngprefix.h pngwio.o: pngpriv.h pngwio.o: pngstruct.h pngwrite.o: png.h @@ -110,6 +125,7 @@ pngwrite.o: pngconf.h pngwrite.o: pngdebug.h pngwrite.o: pnginfo.h pngwrite.o: pnglibconf.h +pngwrite.o: pngprefix.h pngwrite.o: pngpriv.h pngwrite.o: pngstruct.h pngwtran.o: png.h @@ -117,6 +133,7 @@ pngwtran.o: pngconf.h pngwtran.o: pngdebug.h pngwtran.o: pnginfo.h pngwtran.o: pnglibconf.h +pngwtran.o: pngprefix.h pngwtran.o: pngpriv.h pngwtran.o: pngstruct.h pngwutil.o: png.h @@ -124,5 +141,6 @@ pngwutil.o: pngconf.h pngwutil.o: pngdebug.h pngwutil.o: pnginfo.h pngwutil.o: pnglibconf.h +pngwutil.o: pngprefix.h pngwutil.o: pngpriv.h pngwutil.o: pngstruct.h 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 diff --git a/zlib/zconf.h b/zlib/zconf.h index 9ab9caaa1..74f052698 100644 --- a/zlib/zconf.h +++ b/zlib/zconf.h @@ -13,6 +13,10 @@ #ifndef ZCONF_H #define ZCONF_H +/* FLTK: enable symbol prefixes, see README.bundled-libs.txt */ +#define Z_PREFIX 1 +#define z_errmsg fltk_z_errmsg + #if ! (defined(_WIN32) || defined(WIN32)) /* FLTK */ # define HAVE_UNISTD_H /* FLTK */ #endif /* FLTK */ @@ -27,152 +31,152 @@ # define Z_PREFIX_SET /* all linked symbols and init macros */ -# define _dist_code z__dist_code -# define _length_code z__length_code -# define _tr_align z__tr_align -# define _tr_flush_bits z__tr_flush_bits -# define _tr_flush_block z__tr_flush_block -# define _tr_init z__tr_init -# define _tr_stored_block z__tr_stored_block -# define _tr_tally z__tr_tally -# define adler32 z_adler32 -# define adler32_combine z_adler32_combine -# define adler32_combine64 z_adler32_combine64 -# define adler32_z z_adler32_z +# define _dist_code fltk_z__dist_code +# define _length_code fltk_z__length_code +# define _tr_align fltk_z__tr_align +# define _tr_flush_bits fltk_z__tr_flush_bits +# define _tr_flush_block fltk_z__tr_flush_block +# define _tr_init fltk_z__tr_init +# define _tr_stored_block fltk_z__tr_stored_block +# define _tr_tally fltk_z__tr_tally +# define adler32 fltk_z_adler32 +# define adler32_combine fltk_z_adler32_combine +# define adler32_combine64 fltk_z_adler32_combine64 +# define adler32_z fltk_z_adler32_z # ifndef Z_SOLO -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound +# define compress fltk_z_compress +# define compress2 fltk_z_compress2 +# define compressBound fltk_z_compressBound # endif -# define crc32 z_crc32 -# define crc32_combine z_crc32_combine -# define crc32_combine64 z_crc32_combine64 -# define crc32_z z_crc32_z -# define deflate z_deflate -# define deflateBound z_deflateBound -# define deflateCopy z_deflateCopy -# define deflateEnd z_deflateEnd -# define deflateGetDictionary z_deflateGetDictionary -# define deflateInit z_deflateInit -# define deflateInit2 z_deflateInit2 -# define deflateInit2_ z_deflateInit2_ -# define deflateInit_ z_deflateInit_ -# define deflateParams z_deflateParams -# define deflatePending z_deflatePending -# define deflatePrime z_deflatePrime -# define deflateReset z_deflateReset -# define deflateResetKeep z_deflateResetKeep -# define deflateSetDictionary z_deflateSetDictionary -# define deflateSetHeader z_deflateSetHeader -# define deflateTune z_deflateTune -# define deflate_copyright z_deflate_copyright -# define get_crc_table z_get_crc_table +# define crc32 fltk_z_crc32 +# define crc32_combine fltk_z_crc32_combine +# define crc32_combine64 fltk_z_crc32_combine64 +# define crc32_z fltk_z_crc32_z +# define deflate fltk_z_deflate +# define deflateBound fltk_z_deflateBound +# define deflateCopy fltk_z_deflateCopy +# define deflateEnd fltk_z_deflateEnd +# define deflateGetDictionary fltk_z_deflateGetDictionary +# define deflateInit fltk_z_deflateInit +# define deflateInit2 fltk_z_deflateInit2 +# define deflateInit2_ fltk_z_deflateInit2_ +# define deflateInit_ fltk_z_deflateInit_ +# define deflateParams fltk_z_deflateParams +# define deflatePending fltk_z_deflatePending +# define deflatePrime fltk_z_deflatePrime +# define deflateReset fltk_z_deflateReset +# define deflateResetKeep fltk_z_deflateResetKeep +# define deflateSetDictionary fltk_z_deflateSetDictionary +# define deflateSetHeader fltk_z_deflateSetHeader +# define deflateTune fltk_z_deflateTune +# define deflate_copyright fltk_z_deflate_copyright +# define get_crc_table fltk_z_get_crc_table # ifndef Z_SOLO -# define gz_error z_gz_error -# define gz_intmax z_gz_intmax -# define gz_strwinerror z_gz_strwinerror -# define gzbuffer z_gzbuffer -# define gzclearerr z_gzclearerr -# define gzclose z_gzclose -# define gzclose_r z_gzclose_r -# define gzclose_w z_gzclose_w -# define gzdirect z_gzdirect -# define gzdopen z_gzdopen -# define gzeof z_gzeof -# define gzerror z_gzerror -# define gzflush z_gzflush -# define gzfread z_gzfread -# define gzfwrite z_gzfwrite -# define gzgetc z_gzgetc -# define gzgetc_ z_gzgetc_ -# define gzgets z_gzgets -# define gzoffset z_gzoffset -# define gzoffset64 z_gzoffset64 -# define gzopen z_gzopen -# define gzopen64 z_gzopen64 +# define gz_error fltk_z_gz_error +# define gz_intmax fltk_z_gz_intmax +# define gz_strwinerror fltk_z_gz_strwinerror +# define gzbuffer fltk_z_gzbuffer +# define gzclearerr fltk_z_gzclearerr +# define gzclose fltk_z_gzclose +# define gzclose_r fltk_z_gzclose_r +# define gzclose_w fltk_z_gzclose_w +# define gzdirect fltk_z_gzdirect +# define gzdopen fltk_z_gzdopen +# define gzeof fltk_z_gzeof +# define gzerror fltk_z_gzerror +# define gzflush fltk_z_gzflush +# define gzfread fltk_z_gzfread +# define gzfwrite fltk_z_gzfwrite +# define gzgetc fltk_z_gzgetc +# define gzgetc_ fltk_z_gzgetc_ +# define gzgets fltk_z_gzgets +# define gzoffset fltk_z_gzoffset +# define gzoffset64 fltk_z_gzoffset64 +# define gzopen fltk_z_gzopen +# define gzopen64 fltk_z_gzopen64 # ifdef _WIN32 -# define gzopen_w z_gzopen_w +# define gzopen_w fltk_z_gzopen_w # endif -# define gzprintf z_gzprintf -# define gzputc z_gzputc -# define gzputs z_gzputs -# define gzread z_gzread -# define gzrewind z_gzrewind -# define gzseek z_gzseek -# define gzseek64 z_gzseek64 -# define gzsetparams z_gzsetparams -# define gztell z_gztell -# define gztell64 z_gztell64 -# define gzungetc z_gzungetc -# define gzvprintf z_gzvprintf -# define gzwrite z_gzwrite +# define gzprintf fltk_z_gzprintf +# define gzputc fltk_z_gzputc +# define gzputs fltk_z_gzputs +# define gzread fltk_z_gzread +# define gzrewind fltk_z_gzrewind +# define gzseek fltk_z_gzseek +# define gzseek64 fltk_z_gzseek64 +# define gzsetparams fltk_z_gzsetparams +# define gztell fltk_z_gztell +# define gztell64 fltk_z_gztell64 +# define gzungetc fltk_z_gzungetc +# define gzvprintf fltk_z_gzvprintf +# define gzwrite fltk_z_gzwrite # endif -# define inflate z_inflate -# define inflateBack z_inflateBack -# define inflateBackEnd z_inflateBackEnd -# define inflateBackInit z_inflateBackInit -# define inflateBackInit_ z_inflateBackInit_ -# define inflateCodesUsed z_inflateCodesUsed -# define inflateCopy z_inflateCopy -# define inflateEnd z_inflateEnd -# define inflateGetDictionary z_inflateGetDictionary -# define inflateGetHeader z_inflateGetHeader -# define inflateInit z_inflateInit -# define inflateInit2 z_inflateInit2 -# define inflateInit2_ z_inflateInit2_ -# define inflateInit_ z_inflateInit_ -# define inflateMark z_inflateMark -# define inflatePrime z_inflatePrime -# define inflateReset z_inflateReset -# define inflateReset2 z_inflateReset2 -# define inflateResetKeep z_inflateResetKeep -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateUndermine z_inflateUndermine -# define inflateValidate z_inflateValidate -# define inflate_copyright z_inflate_copyright -# define inflate_fast z_inflate_fast -# define inflate_table z_inflate_table +# define inflate fltk_z_inflate +# define inflateBack fltk_z_inflateBack +# define inflateBackEnd fltk_z_inflateBackEnd +# define inflateBackInit fltk_z_inflateBackInit +# define inflateBackInit_ fltk_z_inflateBackInit_ +# define inflateCodesUsed fltk_z_inflateCodesUsed +# define inflateCopy fltk_z_inflateCopy +# define inflateEnd fltk_z_inflateEnd +# define inflateGetDictionary fltk_z_inflateGetDictionary +# define inflateGetHeader fltk_z_inflateGetHeader +# define inflateInit fltk_z_inflateInit +# define inflateInit2 fltk_z_inflateInit2 +# define inflateInit2_ fltk_z_inflateInit2_ +# define inflateInit_ fltk_z_inflateInit_ +# define inflateMark fltk_z_inflateMark +# define inflatePrime fltk_z_inflatePrime +# define inflateReset fltk_z_inflateReset +# define inflateReset2 fltk_z_inflateReset2 +# define inflateResetKeep fltk_z_inflateResetKeep +# define inflateSetDictionary fltk_z_inflateSetDictionary +# define inflateSync fltk_z_inflateSync +# define inflateSyncPoint fltk_z_inflateSyncPoint +# define inflateUndermine fltk_z_inflateUndermine +# define inflateValidate fltk_z_inflateValidate +# define inflate_copyright fltk_z_inflate_copyright +# define inflate_fast fltk_z_inflate_fast +# define inflate_table fltk_z_inflate_table # ifndef Z_SOLO -# define uncompress z_uncompress -# define uncompress2 z_uncompress2 +# define uncompress fltk_z_uncompress +# define uncompress2 fltk_z_uncompress2 # endif -# define zError z_zError +# define zError fltk_z_zError # ifndef Z_SOLO -# define zcalloc z_zcalloc -# define zcfree z_zcfree +# define zcalloc fltk_z_zcalloc +# define zcfree fltk_z_zcfree # endif -# define zlibCompileFlags z_zlibCompileFlags -# define zlibVersion z_zlibVersion +# define zlibCompileFlags fltk_z_zlibCompileFlags +# define zlibVersion fltk_z_zlibVersion /* all zlib typedefs in zlib.h and zconf.h */ -# define Byte z_Byte -# define Bytef z_Bytef -# define alloc_func z_alloc_func -# define charf z_charf -# define free_func z_free_func +# define Byte fltk_z_Byte +# define Bytef fltk_z_Bytef +# define alloc_func fltk_z_alloc_func +# define charf fltk_z_charf +# define free_func fltk_z_free_func # ifndef Z_SOLO -# define gzFile z_gzFile +# define gzFile fltk_z_gzFile # endif -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp -# define in_func z_in_func -# define intf z_intf -# define out_func z_out_func -# define uInt z_uInt -# define uIntf z_uIntf -# define uLong z_uLong -# define uLongf z_uLongf -# define voidp z_voidp -# define voidpc z_voidpc -# define voidpf z_voidpf +# define gz_header fltk_z_gz_header +# define gz_headerp fltk_z_gz_headerp +# define in_func fltk_z_in_func +# define intf fltk_z_intf +# define out_func fltk_z_out_func +# define uInt fltk_z_uInt +# define uIntf fltk_z_uIntf +# define uLong fltk_z_uLong +# define uLongf fltk_z_uLongf +# define voidp fltk_z_voidp +# define voidpc fltk_z_voidpc +# define voidpf fltk_z_voidpf /* all zlib structs in zlib.h and zconf.h */ -# define gz_header_s z_gz_header_s -# define internal_state z_internal_state +# define gz_header_s fltk_z_gz_header_s +# define internal_state fltk_z_internal_state -#endif +#endif /* Z_PREFIX */ /* FLTK */ #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS diff --git a/zlib/zlib.h b/zlib/zlib.h index f09cdaf1e..d7f13a941 100644 --- a/zlib/zlib.h +++ b/zlib/zlib.h @@ -1776,17 +1776,17 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, const char *version, int stream_size)); #ifdef Z_PREFIX_SET -# define z_deflateInit(strm, level) \ +# define fltk_z_deflateInit(strm, level) \ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_inflateInit(strm) \ +# define fltk_z_inflateInit(strm) \ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ +# define fltk_z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) -# define z_inflateInit2(strm, windowBits) \ +# define fltk_z_inflateInit2(strm, windowBits) \ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ (int)sizeof(z_stream)) -# define z_inflateBackInit(strm, windowBits, window) \ +# define fltk_z_inflateBackInit(strm, windowBits, window) \ inflateBackInit_((strm), (windowBits), (window), \ ZLIB_VERSION, (int)sizeof(z_stream)) #else @@ -1821,8 +1821,8 @@ struct gzFile_s { }; ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #ifdef Z_PREFIX_SET -# undef z_gzgetc -# define z_gzgetc(g) \ +# undef fltk_z_gzgetc +# define fltk_z_gzgetc(g) \ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g)) #else # define gzgetc(g) \ @@ -1846,12 +1846,12 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) # ifdef Z_PREFIX_SET -# define z_gzopen z_gzopen64 -# define z_gzseek z_gzseek64 -# define z_gztell z_gztell64 -# define z_gzoffset z_gzoffset64 -# define z_adler32_combine z_adler32_combine64 -# define z_crc32_combine z_crc32_combine64 +# define fltk_z_gzopen fltk_z_gzopen64 +# define fltk_z_gzseek fltk_z_gzseek64 +# define fltk_z_gztell fltk_z_gztell64 +# define fltk_z_gzoffset fltk_z_gzoffset64 +# define fltk_z_adler32_combine fltk_z_adler32_combine64 +# define fltk_z_crc32_combine fltk_z_crc32_combine64 # else # define gzopen gzopen64 # define gzseek gzseek64