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

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

Revision: 1579
          http://sourceforge.net/p/opengtoolkit/svn/1579
Author:   labviewer
Date:     2018-12-16 15:36:32 +0000 (Sun, 16 Dec 2018)
Log Message:
-----------
A few macintosh fixes

Modified Paths:
--------------
    trunk/lvzip/c_source/crypt.c
    trunk/lvzip/c_source/lvapi.c
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/crypt.c
===================================================================
--- trunk/lvzip/c_source/crypt.c	2018-12-15 23:26:06 UTC (rev 1578)
+++ trunk/lvzip/c_source/crypt.c	2018-12-16 15:36:32 UTC (rev 1579)
@@ -85,7 +85,7 @@
 
 /***************************************************************************/
 #ifndef NOCRYPT
-#if unix
+#if defined(unix) || defined(__APPLE_CC__)
 #ifndef ZCR_SEED2
 #  define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #endif

Modified: trunk/lvzip/c_source/lvapi.c
===================================================================
--- trunk/lvzip/c_source/lvapi.c	2018-12-15 23:26:06 UTC (rev 1578)
+++ trunk/lvzip/c_source/lvapi.c	2018-12-16 15:36:32 UTC (rev 1579)
@@ -31,7 +31,10 @@
 #include "zip.h"
 #include "unzip.h"
 #include "lvapi.h"
+
+#ifdef HAVE_BZIP2
 #include "bzip2/bzlib.h"
+#endif
 
 #ifndef VERSIONMADEBY
 # define VERSIONMADEBY   (0x0) /* platform depedent */
@@ -178,7 +181,14 @@
 		                                   "zlib version: %s, build flags: 0x%lX\n"
 										   "minizip version: 1.2.0, September 16th, 2017"
 										   "aes version: 2013\n"
-										   "bzip2 version: %s", lvzip_zlibVersion(), lvzip_zlibCompileFlags(), BZ2_bzlibVersion());
+#ifdef HAVE_BZIP2
+										   "bzip2 version: %s"
+#endif
+                                           , lvzip_zlibVersion(), lvzip_zlibCompileFlags()
+#ifdef HAVE_BZIP2
+                                           , BZ2_bzlibVersion())
+#endif
+                                           ;
     return version;
 }
 

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2018-12-15 23:26:06 UTC (rev 1578)
+++ trunk/lvzip/c_source/lvutil.c	2018-12-16 15:36:32 UTC (rev 1579)
@@ -107,6 +107,7 @@
  #endif
 #elif MacOSX
  #include <CoreFoundation/CoreFoundation.h>
+ #include <CoreServices/CoreServices.h>
  #include <sys/stat.h>
  #include <sys/xattr.h>
  #define ftruncate64 ftruncate

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2018-12-15 23:26:06 UTC (rev 1578)
+++ trunk/lvzip/c_source/lvutil.h	2018-12-16 15:36:32 UTC (rev 1579)
@@ -29,8 +29,6 @@
 #ifndef _lvUtil_H
 #define _lvUtil_H
 
-//#include "zlib.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

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