[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1048] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1048
          http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1048&view=rev
Author:   labviewer
Date:     2010-06-16 15:04:59 +0000 (Wed, 16 Jun 2010)

Log Message:
-----------
Incorporated zlib 1.2.5 and minizip 1.1

Modified Paths:
--------------
    trunk/lvzip/c_source/compress.c
    trunk/lvzip/c_source/iomem.c
    trunk/lvzip/c_source/lvutil.h
    trunk/lvzip/c_source/zutil.c

Modified: trunk/lvzip/c_source/compress.c
===================================================================
--- trunk/lvzip/c_source/compress.c	2010-06-16 15:04:19 UTC (rev 1047)
+++ trunk/lvzip/c_source/compress.c	2010-06-16 15:04:59 UTC (rev 1048)
@@ -5,8 +5,7 @@
 
 /* @(#) $Id$ */
 
-#define ZLIB_INTERNAL
-#include "zlib.h"
+#include "zutil.h"
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level

Modified: trunk/lvzip/c_source/iomem.c
===================================================================
--- trunk/lvzip/c_source/iomem.c	2010-06-16 15:04:19 UTC (rev 1047)
+++ trunk/lvzip/c_source/iomem.c	2010-06-16 15:04:59 UTC (rev 1048)
@@ -11,7 +11,7 @@
 
 voidpf ZCALLBACK mem_open_file_func OF((
    voidpf opaque,
-   const char* filename,
+   const void* filename,
    int mode));
 
 uLong ZCALLBACK mem_read_file_func OF((
@@ -54,7 +54,7 @@
 
 voidpf ZCALLBACK mem_open_file_func (opaque, filename, mode)
    voidpf opaque;
-   const char* filename;
+   const void* filename;
    int mode;
 {
     MEMORY_IO *memio = malloc(sizeof(MEMORY_IO));

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2010-06-16 15:04:19 UTC (rev 1047)
+++ trunk/lvzip/c_source/lvutil.h	2010-06-16 15:04:59 UTC (rev 1048)
@@ -7,7 +7,6 @@
 #ifndef _lvUtil_H
 #define _lvUtil_H
 
-#define ZLIB_INTERNAL
 #include "zlib.h"
 
 #ifdef __cplusplus

Modified: trunk/lvzip/c_source/zutil.c
===================================================================
--- trunk/lvzip/c_source/zutil.c	2010-06-16 15:04:19 UTC (rev 1047)
+++ trunk/lvzip/c_source/zutil.c	2010-06-16 15:04:59 UTC (rev 1048)
@@ -5,7 +5,6 @@
 
 /* @(#) $Id$ */
 
-#define ZLIB_INTERNAL
 #include "zutil.h"
 
 #ifndef NO_DUMMY_DECL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.