summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2009-08-10 01:34:22 +0200
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2009-08-10 01:34:22 +0200
commit04f12295812b6d7c62b7e2236be366f677a3ed06 (patch)
treebdcf727d8ee8ce294972e6a7650e7e84aaaca877
parent9b540cdf6eba2836f3711e9b28365788c22526ac (diff)
Merge failed.HEADmaster
-rw-r--r--mpq-bios.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mpq-bios.c b/mpq-bios.c
index 17cc8ad..4c8289d 100644
--- a/mpq-bios.c
+++ b/mpq-bios.c
@@ -544,8 +544,6 @@ uint64_t mpqlib_ioctl(struct mpq_archive_t * mpq_a, enum mpqlib_ioctl_t command,
va_start(ap, command);
__mpqlib_errno = MPQLIB_ERROR_NO_ERROR;
-
- __mpqlib_errno = MPQLIB_ERROR_NO_ERROR;
switch(command) {
case MPQLIB_IOCTL_NO_ACTION: