diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2014-03-30 16:34:19 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2014-03-30 16:34:19 +0000 |
| commit | 93cffb85dbe5e7e522e061fa21e00df9c8270fbc (patch) | |
| tree | d66772c0f391435208fc3f8f874a2d440a452831 /src/io/inkjar.h | |
| parent | Fix checking for unordered containers on incomplete C++11 implementations (diff) | |
| download | inkscape-93cffb85dbe5e7e522e061fa21e00df9c8270fbc.tar.gz inkscape-93cffb85dbe5e7e522e061fa21e00df9c8270fbc.zip | |
Migrate inkjar to cstdio functions to fix build issues on Free BSD (Thanks Markus Engel); see bug #1232474
(bzr r13233)
Diffstat (limited to 'src/io/inkjar.h')
| -rw-r--r-- | src/io/inkjar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/io/inkjar.h b/src/io/inkjar.h index ea4b0ee32..ee6e33526 100644 --- a/src/io/inkjar.h +++ b/src/io/inkjar.h @@ -27,6 +27,7 @@ #endif #include <glib.h> +#include <cstdio> namespace Inkjar { @@ -87,11 +88,10 @@ typedef uint32_t ub4; * * All memory allocations are done with g_malloc. */ - class JarFile { public: - JarFile() : fd(-1), _filename(NULL), _last_filename(NULL) {} + JarFile() : fd(NULL), _filename(NULL), _last_filename(NULL) {} virtual ~JarFile(); JarFile(gchar const *new_filename); @@ -106,7 +106,7 @@ public: private: - int fd; + FILE *fd; // File descriptor gchar *_filename; z_stream _zs; gchar *_last_filename; |
