Revision: 41902
http://brlcad.svn.sourceforge.net/brlcad/?rev=41902&view=rev
Author: brlcad
Date: 2011-01-02 14:47:37 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
make sure _LARGEFILE64_SOURCE and _FILE_OFFSET_BITS are defined before testing
their values
Modified Paths:
--------------
brlcad/trunk/src/other/libz/zconf.h
brlcad/trunk/src/other/libz/zlib.h
Modified: brlcad/trunk/src/other/libz/zconf.h
===================================================================
--- brlcad/trunk/src/other/libz/zconf.h 2010-12-31 19:18:31 UTC (rev 41901)
+++ brlcad/trunk/src/other/libz/zconf.h 2011-01-02 14:47:37 UTC (rev 41902)
@@ -370,7 +370,7 @@
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* equivalently requesting no 64-bit operations
*/
-#if -_LARGEFILE64_SOURCE - -1 == 1
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE
#endif
Modified: brlcad/trunk/src/other/libz/zlib.h
===================================================================
--- brlcad/trunk/src/other/libz/zlib.h 2010-12-31 19:18:31 UTC (rev 41901)
+++ brlcad/trunk/src/other/libz/zlib.h 2011-01-02 14:47:37 UTC (rev 41902)
@@ -1571,7 +1571,7 @@
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
#endif
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+#if !defined(ZLIB_INTERNAL) && defined(_FILE_OFFSET_BITS) &&
_FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
# define gzopen gzopen64
# define gzseek gzseek64
# define gztell gztell64
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
