From 913bae54e545453fe5c12de34a117995c31a6fb2 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 17 Mar 2015 13:52:57 +0000 Subject: Fix zlib compilation warnings under OS X and maybe Unix/Linux. This was a regression because of an oversight when upgrading the bundled libs. Reported by Manolo, fix confirmed by Kevin in fltk.coredev. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10633 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- zlib/zconf.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/zlib/zconf.h b/zlib/zconf.h index 9987a7755..95c1890c2 100644 --- a/zlib/zconf.h +++ b/zlib/zconf.h @@ -1,3 +1,8 @@ +/* FLTK *************************************************************** */ +/* FLTK Comments marked with FLTK show modifications for FLTK which */ +/* FLTK should probably be preserved when zlib is upgraded. */ +/* FLTK *************************************************************** */ + /* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h @@ -8,6 +13,10 @@ #ifndef ZCONF_H #define ZCONF_H +#if ! (defined(_WIN32) || defined(WIN32)) /* FLTK */ +# define HAVE_UNISTD_H /* FLTK */ +#endif /* FLTK */ + /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. -- cgit v1.2.3