← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to utility/ioz.h

  • Committer: Package Import Robot
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2011-08-28 22:40:00 UTC
  • mfrom: (1.2.19 upstream)
  • Revision ID: package-import@ubuntu.com-20110828224000-j2r1erewlem25dox
Tags: 2.3.0-1
[ Karl Goetz ]
* New upstream version.
* Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0
* Massage work_around_unity_induced_breakage.diff to get it
  applying to the new codebase (The patch assumes commits made
  after 2.3.0 was tagged upstream).

[ Clint Adams ]
* Fudge build system to think there is no libtool mismatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utility/ioz.h
26
26
struct fz_FILE_s;                 /* opaque */
27
27
typedef struct fz_FILE_s fz_FILE;
28
28
 
29
 
/* (possibly) supported methods (depending on config.h) */
30
 
enum fz_method { FZ_PLAIN = 0, FZ_ZLIB = 1, FZ_BZIP2 = 2, FZ_LAST };
31
 
#define FZ_NOT_USED FZ_LAST
 
29
/* (Possibly) supported methods (depending on config.h). */
 
30
enum fz_method {
 
31
  FZ_PLAIN = 0,
 
32
#ifdef HAVE_LIBZ
 
33
  FZ_ZLIB,
 
34
#endif
 
35
#ifdef HAVE_LIBBZ2
 
36
  FZ_BZIP2,
 
37
#endif
 
38
};
32
39
 
33
40
fz_FILE *fz_from_file(const char *filename, const char *in_mode,
34
41
                      enum fz_method method, int compress_level);