summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog10
-rw-r--r--Build/source/texk/kpathsea/c-auto.in3
-rwxr-xr-xBuild/source/texk/kpathsea/configure119
-rw-r--r--Build/source/texk/kpathsea/configure.ac6
-rw-r--r--Build/source/texk/kpathsea/lib.h8
-rw-r--r--Build/source/texk/kpathsea/xcalloc.c6
-rw-r--r--Build/source/texk/kpathsea/xmalloc.c8
-rw-r--r--Build/source/texk/kpathsea/xrealloc.c8
8 files changed, 122 insertions, 46 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 328c42ac8ec..c19a926b8d2 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * lib.h, xcalloc.c, xmalloc.c, xrealloc.c: Change type of size
+ arguments of xcalloc(), xmalloc, and xrealloc() from unsigned
+ to size_t (incompatible change of ABI).
+
+ Update version numbers to 6.0.0.
+
2010-03-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmf.cnf (TEXMF_RESTRICTED_SCRIPTS): The make rules used to
@@ -21,7 +29,7 @@
* texmf.cnf (BIBTEX_CSFILE): Default codepage and sort order
file for BibTeX8.
- (max_strings): Also for BibTeX8 and BibTeX8U.
+ (max_strings): Also for BibTeX8 and BibTeXU.
2010-03-18 Karl Berry <karl@tug.org>
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index 2451854bc8b..d3d91931176 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -238,4 +238,7 @@
#undef inline
#endif
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
#endif /* !KPATHSEA_C_AUTO_H */
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 7530565200e..d4a89f9a8c5 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Kpathsea 5.1.0.
+# Generated by GNU Autoconf 2.65 for Kpathsea 6.0.0dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='5.1.0'
-PACKAGE_STRING='Kpathsea 5.1.0'
+PACKAGE_VERSION='6.0.0dev'
+PACKAGE_STRING='Kpathsea 6.0.0dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1435,7 +1435,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Kpathsea 5.1.0 to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.0.0dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 5.1.0:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.0.0dev:";;
esac
cat <<\_ACEOF
@@ -1619,7 +1619,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 5.1.0
+Kpathsea configure 6.0.0dev
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1987,6 +1987,60 @@ fi
} # ac_fn_c_check_header_mongrel
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
# ----------------------------------------------------
# Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2086,7 +2140,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 5.1.0, which was
+It was created by Kpathsea $as_me 6.0.0dev, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2460,11 +2514,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-KPSEVERSION=5.1.0
+KPSEVERSION=6.0.0dev
-$as_echo "#define KPSEVERSION \"kpathsea version 5.1.0\"" >>confdefs.h
+$as_echo "#define KPSEVERSION \"kpathsea version 6.0.0dev\"" >>confdefs.h
-KPSE_LT_VERSNUM=5:1:0
+KPSE_LT_VERSNUM=6:0:0
am__api_version='1.11'
@@ -4543,13 +4597,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4546: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4600: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4549: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4603: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4552: output\"" >&5)
+ (eval echo "\"\$as_me:4606: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5752,7 +5806,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5755 "configure"' > conftest.$ac_ext
+ echo '#line 5809 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6818,7 +6872,7 @@ fi
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='5.1.0'
+ VERSION='6.0.0dev'
cat >>confdefs.h <<_ACEOF
@@ -7682,11 +7736,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7685: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7689: \$? = $ac_status" >&5
+ echo "$as_me:7743: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8021,11 +8075,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8024: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8028: \$? = $ac_status" >&5
+ echo "$as_me:8082: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8126,11 +8180,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8129: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8183: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8133: \$? = $ac_status" >&5
+ echo "$as_me:8187: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8181,11 +8235,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8238: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8188: \$? = $ac_status" >&5
+ echo "$as_me:8242: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10548,7 +10602,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10551 "configure"
+#line 10605 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10644,7 +10698,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10647 "configure"
+#line 10701 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11613,6 +11667,17 @@ _ACEOF
;;
esac
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
if test "x$ac_cv_member_struct_stat_st_mtim" = x""yes; then :
@@ -12560,7 +12625,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 5.1.0, which was
+This file was extended by Kpathsea $as_me 6.0.0dev, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12626,7 +12691,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Kpathsea config.status 5.1.0
+Kpathsea config.status 6.0.0dev
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 753df32d142..a431d2b1469 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -20,10 +20,10 @@ dnl
dnl After a release, set kpse_lib_dev to "dev", to distinguish
dnl binaries built between releases.
-m4_define([kpse_lib_major], [5])[]dnl
-m4_define([kpse_lib_minor], [1])[]dnl
+m4_define([kpse_lib_major], [6])[]dnl
+m4_define([kpse_lib_minor], [0])[]dnl
m4_define([kpse_lib_micro], [0])[]dnl
-m4_define([kpse_lib_devel], [])[]dnl or "dev"
+m4_define([kpse_lib_devel], [dev])[]dnl or "dev"
m4_define([kpse_version], [kpse_lib_major.kpse_lib_minor.kpse_lib_micro[]kpse_lib_devel])[]dnl
AC_INIT([Kpathsea], [kpse_version], [tex-k@tug.org])
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index 82fffe578c9..d8936c01913 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -1,6 +1,6 @@
/* lib.h: declarations for common, low-level routines in kpathsea.
- Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009 Karl Berry.
+ Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010 Karl Berry.
Copyright 1999, 2000, 2003, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -211,9 +211,9 @@ extern KPSEDLL off_t xftello (FILE *, const_string filename);
/* These call the corresponding function in the standard library, and
abort if those routines fail. Also, `xrealloc' calls `xmalloc' if
OLD_ADDRESS is null. */
-extern KPSEDLL address xmalloc (unsigned size);
-extern KPSEDLL address xrealloc (address old_address, unsigned new_size);
-extern KPSEDLL address xcalloc (unsigned nelem, unsigned elsize);
+extern KPSEDLL address xmalloc (size_t size);
+extern KPSEDLL address xrealloc (address old_address, size_t new_size);
+extern KPSEDLL address xcalloc (size_t nelem, size_t elsize);
/* (Re)Allocate N items of type T using xmalloc/xrealloc. */
#define XTALLOC(n, t) ((t *) xmalloc ((n) * sizeof (t)))
diff --git a/Build/source/texk/kpathsea/xcalloc.c b/Build/source/texk/kpathsea/xcalloc.c
index 0d01c1bcd15..9e1fd9dcb86 100644
--- a/Build/source/texk/kpathsea/xcalloc.c
+++ b/Build/source/texk/kpathsea/xcalloc.c
@@ -20,14 +20,14 @@
void *
-xcalloc (unsigned nelem, unsigned elsize)
+xcalloc (size_t nelem, size_t elsize)
{
void *new_mem = (void*)calloc(nelem ? nelem : 1, elsize ? elsize : 1);
if (new_mem == NULL) {
fprintf(stderr,
- "xcalloc: request for %u elements of size %u failed.\n",
- nelem, elsize);
+ "xcalloc: request for %lu elements of size %lu failed.\n",
+ (unsigned long)nelem, (unsigned long)elsize);
exit(EXIT_FAILURE);
}
diff --git a/Build/source/texk/kpathsea/xmalloc.c b/Build/source/texk/kpathsea/xmalloc.c
index 70871a5ae14..65a0d2d0ca2 100644
--- a/Build/source/texk/kpathsea/xmalloc.c
+++ b/Build/source/texk/kpathsea/xmalloc.c
@@ -1,6 +1,6 @@
/* xmalloc.c: malloc with error checking.
- Copyright 1992, 1993, 2008 Karl Berry.
+ Copyright 1992, 1993, 2008, 2010 Karl Berry.
Copyright 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -20,13 +20,13 @@
void *
-xmalloc (unsigned size)
+xmalloc (size_t size)
{
void *new_mem = (void *)malloc(size ? size : 1);
if (new_mem == NULL) {
- fprintf(stderr, "fatal: memory exhausted (xmalloc of %u bytes).\n",
- size);
+ fprintf(stderr, "fatal: memory exhausted (xmalloc of %lu bytes).\n",
+ (unsigned long)size);
exit(EXIT_FAILURE);
}
diff --git a/Build/source/texk/kpathsea/xrealloc.c b/Build/source/texk/kpathsea/xrealloc.c
index 516ad4463ec..051b4834dbd 100644
--- a/Build/source/texk/kpathsea/xrealloc.c
+++ b/Build/source/texk/kpathsea/xrealloc.c
@@ -18,10 +18,10 @@
#include <kpathsea/config.h>
-extern void *xmalloc (unsigned);
+extern void *xmalloc (size_t);
void *
-xrealloc (void *old_ptr, unsigned size)
+xrealloc (void *old_ptr, size_t size)
{
void *new_mem;
@@ -35,8 +35,8 @@ xrealloc (void *old_ptr, unsigned size)
pointers and unsigned had different sizes. Since the info
is of little or no value anyway, just don't print it. */
fprintf(stderr,
- "fatal: memory exhausted (realloc of %u bytes).\n",
- size);
+ "fatal: memory exhausted (realloc of %lu bytes).\n",
+ (unsigned long)size);
exit(EXIT_FAILURE);
}
}