summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2023-08-19 15:26:18 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2023-08-19 15:26:18 +0000
commit934920c86b1c9757f5759aecd412c1f1efe40e95 (patch)
tree8bf271f0b2571ec1d693265b33133f98d549be54
parent656088cb0574066efe091bf2219e73cb651b55fc (diff)
bibtex-x: Avoid compiler warnings on Windows
git-svn-id: svn://tug.org/texlive/trunk@67984 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/bibtex-x/ChangeLog5
-rw-r--r--Build/source/texk/bibtex-x/bibtex.c6
-rw-r--r--Build/source/texk/bibtex-x/sysdep.h5
-rwxr-xr-xBuild/source/texk/bibtex-x/tests/bibtex8u-mem.test4
4 files changed, 12 insertions, 8 deletions
diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog
index aef597149ed..f881b19602e 100644
--- a/Build/source/texk/bibtex-x/ChangeLog
+++ b/Build/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-20 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * bibtex.c, sysdep.h: Avoid compiler warnings on Windows.
+ * tests/bibtex8u-mem.test: Tweak.
+
2023-08-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* tests/bibtex{8,u}.test, tests/bibtex8-{char,sort}.test,
diff --git a/Build/source/texk/bibtex-x/bibtex.c b/Build/source/texk/bibtex-x/bibtex.c
index 94ccb742ad0..56ad6c0d9df 100644
--- a/Build/source/texk/bibtex-x/bibtex.c
+++ b/Build/source/texk/bibtex-x/bibtex.c
@@ -100,12 +100,6 @@
#include <config.h>
#endif
-#ifdef KPATHSEA
-#include <kpathsea/config.h>
-#include <kpathsea/progname.h>
-#include <kpathsea/variable.h>
-#endif
-
#include "sysdep.h"
#include "bibtex.h"
#include "datatype.h"
diff --git a/Build/source/texk/bibtex-x/sysdep.h b/Build/source/texk/bibtex-x/sysdep.h
index 7edc3230c5a..d137180fe1b 100644
--- a/Build/source/texk/bibtex-x/sysdep.h
+++ b/Build/source/texk/bibtex-x/sysdep.h
@@ -111,6 +111,11 @@
#include <string.h>
#include <ctype.h>
+#ifdef KPATHSEA
+#include <kpathsea/config.h>
+#include <kpathsea/progname.h>
+#include <kpathsea/variable.h>
+#endif
/*-
**============================================================================
diff --git a/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test b/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test
index 7c34b039f70..4e936537a85 100755
--- a/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test
+++ b/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test
@@ -69,14 +69,14 @@ for t in 1 2 3; do
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/../web2c/tests'\;'$srcdir/csf \
BIBINPUTS=./tests \
- $_bibtex8 -s tests/memtest$t || exit 1
+ $_bibtex8 -s tests/memtest$t || exit $((10 + t))
cp -p tests/memtest$t.aux tests/memtestu$t.aux
eval $env \
TEXMFCNF=$srcdir/../kpathsea \
BSTINPUTS=$srcdir/../web2c/tests \
BIBINPUTS=./tests \
- $_bibtexu -s tests/memtestu$t || exit 2
+ $_bibtexu -s tests/memtestu$t || exit $((20 + t))
done