diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-05 18:32:52 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-10-05 18:32:52 +0000 |
| commit | 63420dd95686abbacc30e4ec1a2082235ca05728 (patch) | |
| tree | fd74ccdff7b889aec323596c296e160e4ebadc30 /src/Fl_SVG_Image.cxx | |
| parent | 0cec3f7e9d7fe5a3838bc6985f49ad855ef5426d (diff) | |
Fix name clash with zlib gzopen on (64-bit) Linux.
Compilation error message:
src/Fl_SVG_Image.cxx:80:21: error: out-of-line definition of 'gzopen64' does
not match any declaration in 'Fl_SVG_Image'; did you mean 'gzopen'?
void* Fl_SVG_Image::gzopen(const char *fname) {
^~~~~~
gzopen
/usr/include/zlib.h:1709:20: note: expanded from macro 'gzopen'
# define gzopen gzopen64
^
The culprit was the macro defined in zlib.h (above).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12479 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_SVG_Image.cxx')
| -rw-r--r-- | src/Fl_SVG_Image.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index c1548ec16..313693fbd 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -77,7 +77,7 @@ float Fl_SVG_Image::svg_scaling_(int W, int H) { } /** Opens for reading a potentially gzip'ed file identified by a UTF-8 encoded filename. */ -void* Fl_SVG_Image::gzopen(const char *fname) { +void* Fl_SVG_Image::fl_gzopen(const char *fname) { #if defined(HAVE_LIBZ) # ifdef _WIN32 unsigned wl = fl_utf8towc(fname, strlen(fname), NULL, 0) + 1; @@ -102,7 +102,7 @@ static char *svg_inflate(const char *fname) { struct stat b; fl_stat(fname, &b); long size = b.st_size; - gzFile gzf = (gzFile)Fl_SVG_Image::gzopen(fname); + gzFile gzf = (gzFile)Fl_SVG_Image::fl_gzopen(fname); if (!gzf) return NULL; int l; bool direct = gzdirect(gzf); |