summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/zlib/ChangeLog5
-rw-r--r--cpukit/zlib/zconf.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/zlib/ChangeLog b/cpukit/zlib/ChangeLog
index 7c36ae4b4d..3fd5cac340 100644
--- a/cpukit/zlib/ChangeLog
+++ b/cpukit/zlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09 Ralf Cors├ępius <ralf.corsepius@rtems.org>
+
+ * zconf.h: Regenerate by zlib's configure.
+ Eliminate HAVE_UNISTD_H. Use Z_PREFIX.
+
2010-03-28 Joel Sherrill <joel.sherrill@oarcorp.com>
* zconf.h: Add include of config.h
diff --git a/cpukit/zlib/zconf.h b/cpukit/zlib/zconf.h
index 58880245c1..ea61b5cf2f 100644
--- a/cpukit/zlib/zconf.h
+++ b/cpukit/zlib/zconf.h
@@ -14,7 +14,7 @@
* Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix".
*/
-#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
/* all linked symbols */
# define _dist_code z__dist_code
@@ -360,7 +360,7 @@ typedef uLong FAR uLongf;
typedef Byte *voidp;
#endif
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+#if 1 /* was set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif