Răsfoiți Sursa

fix take 2

svn path=/trunk/mono/; revision=140533
Gonzalo Paniagua Javier 16 ani în urmă
părinte
comite
09a6edee71
1 a modificat fișierele cu 3 adăugiri și 1 ștergeri
  1. 3 1
      support/zlib.h

+ 3 - 1
support/zlib.h

@@ -1369,6 +1369,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t));
 #endif
 
+/* Mono: disable this. We don't use it and makes compilation fail
 #if _FILE_OFFSET_BITS == 64
 #  define gzopen gzopen64
 #  define gzseek gzseek64
@@ -1376,12 +1377,13 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
 #  define adler32_combine adler32_combine64
 #  define crc32_combine crc32_combine64
 #else
+*/
    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
    ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
    ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
    ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
+/*#endif*/
 
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;}; /* hack for buggy compilers */