summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-02-21 17:45:48 +0000
committerThierry Vignaud <tv@mageia.org>2012-02-21 17:45:48 +0000
commitee625703d0a3569926003e28acc25a22229584b7 (patch)
tree12a198b0fc5da0be8878ea36e3b4d18cc3e26b0a
parent03f33375bdb8cd6cea4fa957d366f35cb33b5dd8 (diff)
downloaddrakx-ee625703d0a3569926003e28acc25a22229584b7.tar
drakx-ee625703d0a3569926003e28acc25a22229584b7.tar.gz
drakx-ee625703d0a3569926003e28acc25a22229584b7.tar.bz2
drakx-ee625703d0a3569926003e28acc25a22229584b7.tar.xz
drakx-ee625703d0a3569926003e28acc25a22229584b7.zip
(grab_fd) drop implementation when using gzip//xz, it's uneeded in that case
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/zlibsupport.c14
2 files changed, 2 insertions, 14 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index ab4568944..23f31d19f 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- fix building with newer dietlibc/zlib
+
1.60
- add support for virtio discs
diff --git a/mdk-stage1/zlibsupport.c b/mdk-stage1/zlibsupport.c
index 750241b0f..2b171e72d 100644
--- a/mdk-stage1/zlibsupport.c
+++ b/mdk-stage1/zlibsupport.c
@@ -236,20 +236,6 @@ out_err:
return NULL;
}
-void *grab_fd(int fd, unsigned long *size)
-{
- gzFile gzfd;
-
- gzfd = gzdopen(fd, "rb");
- if (!gzfd)
- return NULL;
-
- /* gzclose(gzfd) would close fd, which would drop locks.
- Don't blame zlib: POSIX locking semantics are so horribly
- broken that they should be ripped out. */
- return grab_contents(gzfd, size);
-}
-
/* gzopen handles uncompressed files transparently. */
void *grab_file(const char *filename, unsigned long *size)
{