r18607 by fschmid - Reverted last committ, as the breakage on my side was caused by a very old zlib.

scribus-commit scribus-commit at lists.scribus.net
Thu Nov 28 19:19:14 UTC 2013


Author: fschmid
Date: Thu Nov 28 19:19:14 2013
New Revision: 18607

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18607
Log:
Reverted last committ, as the breakage on my side was caused by a very old zlib.

Modified:
    trunk/Scribus/scribus/third_party/zip/zip_p.h

Modified: trunk/Scribus/scribus/third_party/zip/zip_p.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18607&path=/trunk/Scribus/scribus/third_party/zip/zip_p.h
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/zip_p.h (original)
+++ trunk/Scribus/scribus/third_party/zip/zip_p.h Thu Nov 28 19:19:14 2013
@@ -62,12 +62,7 @@
     Q_OBJECT
 
 public:
-#if defined _WIN32
-    // uLongf from zconf.h
-    typedef z_crc_t crc_t;
-#else
-	typedef uLongf crc_t;
-#endif
+	typedef z_crc_t crc_t;
 	ZipPrivate();
 	virtual ~ZipPrivate();
 




More information about the scribus-commit mailing list