Revision: 37516
http://brlcad.svn.sourceforge.net/brlcad/?rev=37516&view=rev
Author: bob1961
Date: 2010-02-01 22:18:57 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Added code to remove WIN32 if defined when WIN64 is defined.
Modified Paths:
--------------
brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h
Modified: brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h
===================================================================
--- brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h 2010-02-01 07:17:20 UTC
(rev 37515)
+++ brlcad/trunk/src/other/openNURBS/opennurbs_zlib.h 2010-02-01 22:18:57 UTC
(rev 37516)
@@ -40,6 +40,11 @@
#include <zlib.h>
+#if defined(WIN32) && defined(WIN64)
+/* zlib.h includes zconf.h which defines WIN32 */
+#undef WIN32
+#endif
+
ON_BEGIN_EXTERNC
voidpf zcalloc (voidpf, unsigned, unsigned);
void zcfree (voidpf, voidpf);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
