1 files changed, 16 insertions, 21 deletions
diff --git a/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp b/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp
index 0ee6ca6ce25..e5a092595ff 100644
--- a/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp
+++ b/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp
@@ -1,23 +1,18 @@
-$NetBSD: patch-src_compression_zziplib_generic_fseeko.cpp,v 1.1 2012/01/11 19:01:48 hans Exp $
+$NetBSD: patch-src_compression_zziplib_generic_fseeko.cpp,v 1.2 2012/03/15 20:16:24 hans Exp $
 
-Don't jump over variable initialization.
-
---- src/compression/zziplib/generic/fseeko.cpp.orig	2008-01-05 18:33:45.000000000 +0100
-+++ src/compression/zziplib/generic/fseeko.cpp	2011-12-30 16:11:43.327510421 +0100
-@@ -445,6 +445,7 @@ struct zzip_entry_file /* : zzip_file_he
- zzip__new__ ZZIP_ENTRY_FILE*
- zzip_entry_fopen (ZZIP_ENTRY* entry, int takeover)
- {
-+    ___ zzip_off_t seek;
-     if (! entry) return 0;
-     if (! takeover) {
- 	ZZIP_ENTRY* found = (ZZIP_ENTRY*)malloc (sizeof(*entry));
-@@ -472,7 +473,7 @@ zzip_entry_fopen (ZZIP_ENTRY* entry, int
-     file->zlib.zalloc = Z_NULL;
-     file->zlib.zfree = Z_NULL;
+--- src/compression/zziplib/generic/fseeko.cpp.orig	2008-01-05 17:33:45.000000000 +0000
++++ src/compression/zziplib/generic/fseeko.cpp
+@@ -52,13 +52,8 @@
+ #include <zzip___mmap.h>
+ #include <zzip___fnmatch.h>
+ 
+-#if __STDC_VERSION__+0 > 199900L
+-#define ___
+-#define ____
+-#else
+ #define ___ {
+ #define ____ }
+-#endif
  
--    ___ zzip_off_t seek = file->data;
-+    seek = file->data;
-     seek += sizeof(file->buffer); seek -= seek & (sizeof(file->buffer)-1);
-     assert (file->data < seek); /* pre-read to next PAGESIZE boundary... */
-     fseeko (file->entry->diskfile, file->data + file->dataoff, SEEK_SET);
+ #ifndef ZZIP_HAVE_FSEEKO
+ #define fseeko fseek