summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdf-x
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 08:31:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 08:31:11 +0000
commit8ebb0079ddc9941c4bce2f9cb38fd1cd6957ebae (patch)
tree19f11e56c0c2b60f0455a08165bcec6c9f005cb1 /Build/source/texk/dvipdf-x
parent4fd3c95ff0083729460b52ee6594e137b882186e (diff)
Added a preliminary texlive.info
Various minor build fixes git-svn-id: svn://tug.org/texlive/trunk@31604 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdf-x')
-rw-r--r--Build/source/texk/dvipdf-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdf-x/config.h.in6
-rwxr-xr-xBuild/source/texk/dvipdf-x/configure41
-rw-r--r--Build/source/texk/dvipdf-x/src/pdfobj.c2
-rw-r--r--Build/source/texk/dvipdf-x/xsrc/epdf.c2
-rw-r--r--Build/source/texk/dvipdf-x/xsrc/pdfobj.c2
6 files changed, 55 insertions, 3 deletions
diff --git a/Build/source/texk/dvipdf-x/ChangeLog b/Build/source/texk/dvipdf-x/ChangeLog
index 14a39fb0497..9b9819b94f1 100644
--- a/Build/source/texk/dvipdf-x/ChangeLog
+++ b/Build/source/texk/dvipdf-x/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * xsrc/epdf.c (add_stream_flate): Use z_const.
+ * (x)src/pdfobj.c (pdf_add_stream_flate): Use z_const.
+
2013-08-08 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/dvipdfmx.c, src/pdfdoc.[ch], src/spc_pdfm.c,
diff --git a/Build/source/texk/dvipdf-x/config.h.in b/Build/source/texk/dvipdf-x/config.h.in
index f5e7527b596..684bb4c43a0 100644
--- a/Build/source/texk/dvipdf-x/config.h.in
+++ b/Build/source/texk/dvipdf-x/config.h.in
@@ -214,6 +214,9 @@
# endif
#endif
+/* Define to 1 if <zlib.h> declares 'z_const'. */
+#undef ZLIB_CONST
+
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
@@ -261,3 +264,6 @@
/* Define to the type of an unsigned integer type of width exactly 64 bits if
such a type exists and the standard includes do not define it. */
#undef uint64_t
+
+/* Define as empty if not declared in <zlib.h>. */
+#undef z_const
diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index c65b9e1b330..6ac4efff518 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -15482,6 +15482,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h
${top_builddir}/../../libs/zlib/include/zconf.h:
cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if <zlib.h> defines 'z_const'" >&5
+$as_echo_n "checking if <zlib.h> defines 'z_const'... " >&6; }
+if ${kpse_cv_have_decl_z_const+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
+eval LIBS=\"$ZLIB_LIBS \$LIBS\"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <zlib.h>
+int
+main ()
+{
+z_const char * foo();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_decl_z_const=yes
+else
+ kpse_cv_have_decl_z_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5
+$as_echo "$kpse_cv_have_decl_z_const" >&6; }
+case $kpse_cv_have_decl_z_const in #(
+ yes) :
+
+$as_echo "#define ZLIB_CONST 1" >>confdefs.h
+ ;; #(
+ *) :
+
+$as_echo "#define z_const /**/" >>confdefs.h
+ ;;
+esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
diff --git a/Build/source/texk/dvipdf-x/src/pdfobj.c b/Build/source/texk/dvipdf-x/src/pdfobj.c
index ba431d9be9a..55cc96912d9 100644
--- a/Build/source/texk/dvipdf-x/src/pdfobj.c
+++ b/Build/source/texk/dvipdf-x/src/pdfobj.c
@@ -1815,7 +1815,7 @@ pdf_add_stream_flate (pdf_obj *dst, const void *data, long len)
z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL;
- z.next_in = (Bytef *) data; z.avail_in = len;
+ z.next_in = (z_const Bytef *) data; z.avail_in = len;
z.next_out = (Bytef *) wbuf; z.avail_out = WBUF_SIZE;
if (inflateInit(&z) != Z_OK) {
diff --git a/Build/source/texk/dvipdf-x/xsrc/epdf.c b/Build/source/texk/dvipdf-x/xsrc/epdf.c
index 73a8ec21f63..53c9fdf554c 100644
--- a/Build/source/texk/dvipdf-x/xsrc/epdf.c
+++ b/Build/source/texk/dvipdf-x/xsrc/epdf.c
@@ -816,7 +816,7 @@ add_stream_flate (pdf_obj *dst, const void *data, long len)
z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL;
- z.next_in = (Bytef *) data; z.avail_in = len;
+ z.next_in = (z_const Bytef *) data; z.avail_in = len;
z.next_out = (Bytef *) wbuf; z.avail_out = WBUF_SIZE;
if (inflateInit(&z) != Z_OK) {
diff --git a/Build/source/texk/dvipdf-x/xsrc/pdfobj.c b/Build/source/texk/dvipdf-x/xsrc/pdfobj.c
index 30a9b6bdb3b..6c8d66780f4 100644
--- a/Build/source/texk/dvipdf-x/xsrc/pdfobj.c
+++ b/Build/source/texk/dvipdf-x/xsrc/pdfobj.c
@@ -1776,7 +1776,7 @@ pdf_add_stream_flate (pdf_obj *dst, const void *data, long len)
z.zalloc = Z_NULL; z.zfree = Z_NULL; z.opaque = Z_NULL;
- z.next_in = (Bytef *) data; z.avail_in = len;
+ z.next_in = (z_const Bytef *) data; z.avail_in = len;
z.next_out = (Bytef *) wbuf; z.avail_out = WBUF_SIZE;
if (inflateInit(&z) != Z_OK) {