Author: cazfi
Date: Mon May 18 23:01:48 2015
New Revision: 29108

URL: http://svn.gna.org/viewcvs/freeciv?rev=29108&view=rev
Log:
Define macros about available compress types in the public freeciv_config.h

See patch #6089

Modified:
    branches/S2_6/common/game.h
    branches/S2_6/configure.ac
    branches/S2_6/gen_headers/freeciv_config.h.in
    branches/S2_6/server/savegame.c
    branches/S2_6/server/settings.c
    branches/S2_6/server/srv_main.c
    branches/S2_6/utility/ioz.c
    branches/S2_6/utility/ioz.h
    branches/S2_6/utility/registry_ini.c
    branches/S2_6/utility/support.c
    branches/S2_6/utility/support.h

Modified: branches/S2_6/common/game.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/game.h?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/common/game.h (original)
+++ branches/S2_6/common/game.h Mon May 18 23:01:48 2015
@@ -595,11 +595,11 @@
 #define GAME_MIN_COMPRESS_LEVEL     1
 #define GAME_MAX_COMPRESS_LEVEL     9
 
-#if defined(HAVE_LIBBZ2)
+#if defined(FREECIV_HAVE_LIBBZ2)
 #  define GAME_DEFAULT_COMPRESS_TYPE FZ_BZIP2
-#elif defined(HAVE_LIBZ)
+#elif defined(FREECIV_HAVE_LIBZ)
 #  define GAME_DEFAULT_COMPRESS_TYPE FZ_ZLIB
-#elif defined(HAVE_LIBLZMA)
+#elif defined(FREECIV_HAVE_LIBLZMA)
 #  define GAME_DEFAULT_COMPRESS_TYPE FZ_XZ
 #else
 #  define GAME_DEFAULT_COMPRESS_TYPE FZ_PLAIN

Modified: branches/S2_6/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/configure.ac  (original)
+++ branches/S2_6/configure.ac  Mon May 18 23:01:48 2015
@@ -641,8 +641,8 @@
 COMMON_LIBS=-lm
 
 dnl Check for zlib
-AC_CHECK_LIB(z, gzgets,
-  [AC_DEFINE([HAVE_LIBZ], [1], [zlib is available])
+AC_CHECK_LIB([z], [gzgets],
+  [AC_DEFINE([FREECIV_HAVE_LIBZ], [1], [zlib is available])
 UTILITY_LIBS="${UTILITY_LIBS} -lz"
 COMMON_LIBS="$COMMON_LIBS -lz"], 
   AC_MSG_ERROR([Could not find zlib library.]))
@@ -659,7 +659,7 @@
 dnl Check for bzip2 compression
 AC_CHECK_LIB(bz2, BZ2_bzReadOpen,
   [AC_CHECK_HEADERS([bzlib.h],
-   [AC_DEFINE([HAVE_LIBBZ2], [1], [libbzip2 is available])
+   [AC_DEFINE([FREECIV_HAVE_LIBBZ2], [1], [libbzip2 is available])
 UTILITY_LIBS="${UTILITY_LIBS} -lbz2"
 libbz2_available=true])])
 if test "x$libbz2_available" != "xtrue" ; then
@@ -669,7 +669,7 @@
 dnl Check for xz compression
 AC_CHECK_LIB(lzma, lzma_code,
   [AC_CHECK_HEADERS([lzma.h],
-   [AC_DEFINE([HAVE_LIBLZMA], [1], [liblzma is available])
+   [AC_DEFINE([FREECIV_HAVE_LIBLZMA], [1], [liblzma is available])
 UTILITY_LIBS="${UTILITY_LIBS} -llzma"
 libxz_available=true])])
 if test "x$libxz_available" != "xtrue" ; then

Modified: branches/S2_6/gen_headers/freeciv_config.h.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in       (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in       Mon May 18 23:01:48 2015
@@ -59,4 +59,13 @@
 /* No freeciv specific debugging support at all */
 #undef FREECIV_NDEBUG
 
+/* zlib is available */
+#undef FREECIV_HAVE_LIBZ
+
+/* libbzip2 is available */
+#undef FREECIV_HAVE_LIBBZ2
+
+/* liblzma is available */
+#undef FREECIV_HAVE_LIBLZMA
+
 #endif /* FC__FREECIV_CONFIG_H */

Modified: branches/S2_6/server/savegame.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/server/savegame.c     (original)
+++ branches/S2_6/server/savegame.c     Mon May 18 23:01:48 2015
@@ -423,26 +423,26 @@
   case 0:               /* Was FZ_PLAIN. */
     return FZ_PLAIN;
   case 1:               /* Was FZ_ZLIB. */
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
     return FZ_ZLIB;
 #else
     log_verbose("Not compiled with zlib support, reverting to default.");
     break;
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case 2:               /* Was FZ_BZIP2. */
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
     return FZ_BZIP2;
 #else
     log_verbose("Not compiled with bzib2 support, reverting to default.");
     break;
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case 3:
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
     return FZ_XZ;
 #else
     log_verbose("Not compiled with xz support, reverting to default.");
     break;
-#endif /* HAVE_LIBLZMA */
+#endif /* FREECIV_HAVE_LIBLZMA */
   }
   return GAME_DEFAULT_COMPRESS_TYPE;
 }

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/server/settings.c     (original)
+++ branches/S2_6/server/settings.c     Mon May 18 23:01:48 2015
@@ -506,13 +506,13 @@
 {
   switch (compresstype) {
   NAME_CASE(FZ_PLAIN, "PLAIN", N_("No compression"));
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
   NAME_CASE(FZ_ZLIB, "LIBZ", N_("Using zlib (gzip format)"));
 #endif
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
   NAME_CASE(FZ_BZIP2, "BZIP2", N_("Using bzip2"));
 #endif
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   NAME_CASE(FZ_XZ, "XZ", N_("Using xz"));
 #endif
   }

Modified: branches/S2_6/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c     (original)
+++ branches/S2_6/server/srv_main.c     Mon May 18 23:01:48 2015
@@ -1388,19 +1388,19 @@
 
   if (game.server.save_compress_level > 0) {
     switch (game.server.save_compress_type) {
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
     case FZ_ZLIB:
       /* Append ".gz" to filename. */
       sz_strlcat(filepath, ".gz");
       break;
 #endif
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
     case FZ_BZIP2:
       /* Append ".bz2" to filename. */
       sz_strlcat(filepath, ".bz2");
       break;
 #endif
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
    case FZ_XZ:
       /* Append ".xz" to filename. */
       sz_strlcat(filepath, ".xz");

Modified: branches/S2_6/utility/ioz.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/ioz.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/utility/ioz.c (original)
+++ branches/S2_6/utility/ioz.c Mon May 18 23:01:48 2015
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
 #include <zlib.h>
 #endif
 
@@ -58,7 +58,7 @@
 
 #include "ioz.h"
 
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
 struct bzip2_struct {
   BZFILE *file;
   FILE *plain;
@@ -66,9 +66,9 @@
   int firstbyte;
   bool eof;
 };
-#endif /* HAVE_LIBBZ2 */
-
-#ifdef HAVE_LIBLZMA
+#endif /* FREECIV_HAVE_LIBBZ2 */
+
+#ifdef FREECIV_HAVE_LIBLZMA
 
 #define PLAIN_FILE_BUF_SIZE (250*1024)     /* 250kb */
 #define XZ_DECODER_TEST_SIZE (4*1024)      /* 4kb */
@@ -105,7 +105,7 @@
 
 static bool xz_outbuffer_to_file(fz_FILE *fp, lzma_action action);
 
-#endif /* HAVE_LIBLZMA */
+#endif /* FREECIV_HAVE_LIBLZMA */
 
 struct mem_fzFILE {
   bool control;
@@ -121,13 +121,13 @@
   union {
     struct mem_fzFILE mem;
     FILE *plain;               /* FZ_PLAIN */
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
     gzFile zlib;                 /* FZ_ZLIB */
 #endif
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
     struct bzip2_struct bz2;
 #endif
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
     struct xz_struct xz;
 #endif
   } u;
@@ -140,13 +140,13 @@
 {
   switch (method) {
   case FZ_PLAIN:
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
 #endif
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
 #endif
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
 #endif
     return TRUE;
@@ -207,16 +207,16 @@
     /* Writing: */
     fp->mode = 'w';
   } else {
-#if defined(HAVE_LIBBZ2) || defined(HAVE_LIBLZMA)
+#if defined(FREECIV_HAVE_LIBBZ2) || defined(FREECIV_HAVE_LIBLZMA)
     char test_mode[4];
     sz_strlcpy(test_mode, mode);
     sz_strlcat(test_mode, "b");
-#endif /* HAVE_LIBBZ2 || HAVE_LIBLZMA */
+#endif /* FREECIV_HAVE_LIBBZ2 || FREECIV_HAVE_LIBLZMA */
 
     /* Reading: ignore specified method and try each: */
     fp->mode = 'r';
 
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
     /* Try to open as bzip2 file
        This is simplest test, so do it first. */
     method = FZ_BZIP2;
@@ -274,9 +274,9 @@
       BZ2_bzReadClose(&tmp_err, fp->u.bz2.file);
       fclose(fp->u.bz2.plain);
     }
-#endif /* HAVE_LIBBZ2 */
-
-#ifdef HAVE_LIBLZMA
+#endif /* FREECIV_HAVE_LIBBZ2 */
+
+#ifdef FREECIV_HAVE_LIBLZMA
     /* Try to open as xz file */
     memset(&fp->u.xz.stream, 0, sizeof(lzma_stream));
     fp->u.xz.error = lzma_stream_decoder(&fp->u.xz.stream,
@@ -328,9 +328,9 @@
       free(fp);
       return NULL;
     }
-#endif /* HAVE_LIBLZMA */
-
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBLZMA */
+
+#ifdef FREECIV_HAVE_LIBZ
     method = FZ_ZLIB;
 #else
     method = FZ_PLAIN;
@@ -340,7 +340,7 @@
   fp->method = fz_method_validate(method);
 
   switch (fp->method) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     {
       lzma_ret ret;
@@ -364,8 +364,8 @@
       fp->u.xz.plain = fc_fopen(filename, mode);
     }
     return fp;
-#endif /* HAVE_LIBLZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LIBLZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     /*  bz2 files are binary files, so we should add "b" to mode! */
     sz_strlcat(mode,"b");
@@ -390,8 +390,8 @@
       fp = NULL;
     }
     return fp;
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     /*  gz files are binary files, so we should add "b" to mode! */
     sz_strlcat(mode,"b");
@@ -404,7 +404,7 @@
       fp = NULL;
     }
     return fp;
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     fp->u.plain = fc_fopen(filename, mode);
     if (!fp->u.plain) {
@@ -463,7 +463,7 @@
   }
 
   switch (fz_method_validate(fp->method)) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     if (fp->mode == 'w' && !xz_outbuffer_to_file(fp, LZMA_FINISH)) {
       error = 1;
@@ -474,8 +474,8 @@
     fclose(fp->u.xz.plain);
     free(fp);
     return error;
-#endif /* HAVE_LIBLZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LIBLZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     if ('w' == fp->mode) {
       BZ2_bzWriteClose(&fp->u.bz2.error, fp->u.bz2.file, 0, NULL, NULL);
@@ -486,13 +486,13 @@
     fclose(fp->u.bz2.plain);
     free(fp);
     return BZ_OK == error ? 0 : 1;
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     error = gzclose(fp->u.zlib);
     free(fp);
     return 0 > error ? error : 0; /* Only negative Z values are errors. */
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     error = fclose(fp->u.plain);
     free(fp);
@@ -552,7 +552,7 @@
   }
 
   switch (fz_method_validate(fp->method)) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     {
       int i, j;
@@ -639,8 +639,8 @@
       return buffer;
     }
     break;
-#endif /* HAVE_LIBLZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LIBLZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     {
       char *retval = NULL;
@@ -681,11 +681,11 @@
       buffer[i] = '\0';
       return retval;
     }
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     return gzgets(fp->u.zlib, buffer, size);
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     return fgets(buffer, size, fp->u.plain);
   }
@@ -696,7 +696,7 @@
   return NULL;
 }
 
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
 
 /***************************************************************
   Helper function to do given compression action and writing
@@ -729,7 +729,7 @@
 
   return TRUE;
 }
-#endif /* HAVE_LIBLZMA */
+#endif /* FREECIV_HAVE_LIBLZMA */
 
 /***************************************************************
   Print formated, like fprintf.
@@ -751,7 +751,7 @@
   fc_assert_ret_val(!fp->memory, 0);
 
   switch (fz_method_validate(fp->method)) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     {
       int num;
@@ -775,8 +775,8 @@
       }
     }
     break;
-#endif /* HAVE_LIBLZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LIBLZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     {
       char buffer[65536];
@@ -795,8 +795,8 @@
         return strlen(buffer);
       }
     }
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     {
       char buffer[65536];
@@ -810,7 +810,7 @@
       }
       return gzwrite(fp->u.zlib, buffer, (unsigned int)strlen(buffer));
     }
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     va_start(ap, format);
     num = vfprintf(fp->u.plain, format, ap);
@@ -837,7 +837,7 @@
   }
 
   switch (fz_method_validate(fp->method)) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     if (fp->u.xz.error != LZMA_OK
         && fp->u.xz.error != LZMA_STREAM_END) {
@@ -846,13 +846,13 @@
       return 0;
     }
     break;
-#endif /* HAVE_LZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     return (BZ_OK != fp->u.bz2.error
             && BZ_STREAM_END != fp->u.bz2.error);
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     {
       int error;
@@ -860,7 +860,7 @@
       (void) gzerror(fp->u.zlib, &error); /* Ignore string result here. */
       return 0 > error ? error : 0; /* Only negative Z values are errors. */
     }
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     return ferror(fp->u.plain);
     break;
@@ -886,7 +886,7 @@
   fc_assert_ret_val(!fp->memory, NULL);
 
   switch (fz_method_validate(fp->method)) {
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   case FZ_XZ:
     {
       static char xzerror[50];
@@ -937,8 +937,8 @@
       return xzerror;
     }
     break;
-#endif /* HAVE_LIBLZMA */
-#ifdef HAVE_LIBBZ2
+#endif /* FREECIV_HAVE_LIBLZMA */
+#ifdef FREECIV_HAVE_LIBBZ2
   case FZ_BZIP2:
     {
       static char bzip2error[50];
@@ -1004,8 +1004,8 @@
       }
       return bzip2error;
     }
-#endif /* HAVE_LIBBZ2 */
-#ifdef HAVE_LIBZ
+#endif /* FREECIV_HAVE_LIBBZ2 */
+#ifdef FREECIV_HAVE_LIBZ
   case FZ_ZLIB:
     {
       int errnum;
@@ -1013,7 +1013,7 @@
 
       return Z_ERRNO == errnum ? fc_strerror(fc_get_errno()) : estr;
     }
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
   case FZ_PLAIN:
     return fc_strerror(fc_get_errno());
   }

Modified: branches/S2_6/utility/ioz.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/ioz.h?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/utility/ioz.h (original)
+++ branches/S2_6/utility/ioz.h Mon May 18 23:01:48 2015
@@ -25,6 +25,8 @@
 
 #include <stdio.h>             /* FILE */
 
+#include <freeciv_config.h>
+
 #include "shared.h"            /* fc__attribute */
 
 struct fz_FILE_s;                /* opaque */
@@ -33,13 +35,13 @@
 /* (Possibly) supported methods (depending on fc_config.h). */
 enum fz_method {
   FZ_PLAIN = 0,
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
   FZ_ZLIB,
 #endif
-#ifdef HAVE_LIBBZ2
+#ifdef FREECIV_HAVE_LIBBZ2
   FZ_BZIP2,
 #endif
-#ifdef HAVE_LIBLZMA
+#ifdef FREECIV_HAVE_LIBLZMA
   FZ_XZ,
 #endif
 };

Modified: branches/S2_6/utility/registry_ini.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/registry_ini.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/utility/registry_ini.c        (original)
+++ branches/S2_6/utility/registry_ini.c        Mon May 18 23:01:48 2015
@@ -606,7 +606,7 @@
   and with all of the columns for all uN in the same order as for u0.
 
   If compression_level is non-zero, then compress using zlib.  (Should
-  only supply non-zero compression_level if already know that HAVE_LIBZ.)
+  only supply non-zero compression_level if already know that 
FREECIV_HAVE_LIBZ.)
   Below simply specifies FZ_ZLIB method, since fz_fromFile() automatically
   changes to FZ_PLAIN method when level == 0.
 **************************************************************************/

Modified: branches/S2_6/utility/support.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.c?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/utility/support.c     (original)
+++ branches/S2_6/utility/support.c     Mon May 18 23:01:48 2015
@@ -74,7 +74,7 @@
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
 #include <zlib.h>
 #endif
 #ifdef WIN32_NATIVE
@@ -92,7 +92,7 @@
 #  include <libgen.h>
 #endif
 
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
 #include <zlib.h>
 #endif
 
@@ -330,7 +330,7 @@
   Wrapper function for gzopen() with filename conversion to local
   encoding on Windows.
 *****************************************************************/
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
 gzFile fc_gzopen(const char *filename, const char *opentype)
 {
 #ifdef WIN32_NATIVE
@@ -344,7 +344,7 @@
        return gzopen(filename, opentype);
 #endif /* WIN32_NATIVE */
 }
-#endif /* HAVE_LIBZ */
+#endif /* FREECIV_HAVE_LIBZ */
 
 /******************************************************************
   Wrapper function for opendir() with filename conversion to local

Modified: branches/S2_6/utility/support.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.h?rev=29108&r1=29107&r2=29108&view=diff
==============================================================================
--- branches/S2_6/utility/support.h     (original)
+++ branches/S2_6/utility/support.h     Mon May 18 23:01:48 2015
@@ -118,7 +118,7 @@
 int fc_stricoll(const char *str0, const char *str1);
 
 FILE *fc_fopen(const char *filename, const char *opentype);
-#ifdef HAVE_LIBZ
+#ifdef FREECIV_HAVE_LIBZ
 #include <zlib.h>
 gzFile fc_gzopen(const char *filename, const char *opentype);
 #endif


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to