Commit 25f70e69 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed warnigs from zlib defines

parent 3af92a9d
...@@ -59,7 +59,14 @@ typedef void* gzFile; ...@@ -59,7 +59,14 @@ typedef void* gzFile;
#endif #endif
#if USE_ZLIB #if USE_ZLIB
#include <zlib.h> # undef HAVE_UNISTD_H //to avoid redefinition
# ifndef _LFS64_LARGEFILE
# define _LFS64_LARGEFILE 0
# endif
# ifndef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 0
# endif
# include <zlib.h>
#endif #endif
/****************************************************************************************\ /****************************************************************************************\
......
...@@ -51,12 +51,21 @@ ...@@ -51,12 +51,21 @@
and png2bmp sample from libpng distribution (Copyright (C) 1999-2001 MIYASAKA Masaru) and png2bmp sample from libpng distribution (Copyright (C) 1999-2001 MIYASAKA Masaru)
\****************************************************************************************/ \****************************************************************************************/
#undef HAVE_UNISTD_H //to avoid redefinition
#ifndef _LFS64_LARGEFILE
# define _LFS64_LARGEFILE 0
#endif
#ifndef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 0
#endif
#ifdef HAVE_LIBPNG_PNG_H #ifdef HAVE_LIBPNG_PNG_H
#include <libpng/png.h> #include <libpng/png.h>
#else #else
#include <png.h> #include <png.h>
#endif #endif
#include <zlib.h> #include <zlib.h>
#include "grfmt_png.hpp" #include "grfmt_png.hpp"
#if defined _MSC_VER && _MSC_VER >= 1200 #if defined _MSC_VER && _MSC_VER >= 1200
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment