aboutsummaryrefslogtreecommitdiffstats
path: root/zconf.h
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2010-04-20 18:42:51 +0000
committerXin LI <delphij@FreeBSD.org>2010-04-20 18:42:51 +0000
commit20c14533dda078fcc83f6ad7f1221933f1fdd87b (patch)
treeb233f95e3f1ecb7f8e66eac5c6ed4fcbcc4684e3 /zconf.h
parent1a0a89c328dc7176c2058e08087761d0b9957ff8 (diff)
downloadsrc-vendor/zlib/1.2.5.tar.gz
src-vendor/zlib/1.2.5.zip
Vendor import of zlib 1.2.5.vendor/zlib/1.2.5
Diffstat (limited to 'zconf.h')
-rw-r--r--zconf.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/zconf.h b/zconf.h
index 1988920109fd..02ce56c4313b 100644
--- a/zconf.h
+++ b/zconf.h
@@ -315,10 +315,6 @@
# endif
#endif
-#ifdef HAVE_VISIBILITY_PRAGMA
-# define ZEXTERN __attribute__((visibility ("default"))) extern
-#endif
-
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
@@ -368,6 +364,16 @@ typedef uLong FAR uLongf;
# include <sys/types.h> /* for off_t */
#endif
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+# undef _LARGEFILE64_SOURCE
+#endif
+
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_* and off_t */
# ifdef VMS