bibtex-x: Avoid compiler warnings on Windows

git-svn-id: svn://tug.org/texlive/trunk/Build/source@67984 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Aug 19, 2023 · 3fd698f · 3fd698f
1 parent 4d1a042
commit 3fd698f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/texk/bibtex-x/ChangeLog b/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/texk/bibtex-x/bibtex.c b/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/texk/bibtex-x/sysdep.h b/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/texk/bibtex-x/tests/bibtex8u-mem.test b/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