r18606 by fschmid - Apply last fix from Jean only for Windows, as it broke compiling under Linux

scribus-commit scribus-commit at lists.scribus.net
Tue Nov 26 22:31:14 UTC 2013


Author: fschmid
Date: Tue Nov 26 22:31:14 2013
New Revision: 18606

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18606
Log:
Apply last fix from Jean only for Windows, as it broke compiling under Linux

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=18606&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 Tue Nov 26 22:31:14 2013
@@ -62,9 +62,12 @@
     Q_OBJECT
 
 public:
+#if defined _WIN32
     // uLongf from zconf.h
     typedef z_crc_t crc_t;
-
+#else
+	typedef uLongf crc_t;
+#endif
 	ZipPrivate();
 	virtual ~ZipPrivate();
 




More information about the scribus-commit mailing list