texlive[67984] Build/source/texk/bibtex-x: bibtex-x: Avoid compiler

[commits+takuji at tug.org]

Revision: 67984
          http://tug.org/svn/texlive?view=revision&revision=67984
Author:   takuji
Date:     2023-08-19 17:26:18 +0200 (Sat, 19 Aug 2023)
Log Message:
-----------
bibtex-x: Avoid compiler warnings on Windows

Modified Paths:
--------------
    trunk/Build/source/texk/bibtex-x/ChangeLog
    trunk/Build/source/texk/bibtex-x/bibtex.c
    trunk/Build/source/texk/bibtex-x/sysdep.h
    trunk/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test

Modified: trunk/Build/source/texk/bibtex-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/bibtex-x/ChangeLog	2023-08-19 15:10:30 UTC (rev 67983)
+++ trunk/Build/source/texk/bibtex-x/ChangeLog	2023-08-19 15:26:18 UTC (rev 67984)
@@ -1,3 +1,8 @@
+2023-08-20  TANAKA Takuji  <ttk at 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 at t-lab.opal.ne.jp>
 
 	* tests/bibtex{8,u}.test, tests/bibtex8-{char,sort}.test,

Modified: trunk/Build/source/texk/bibtex-x/bibtex.c
===================================================================
--- trunk/Build/source/texk/bibtex-x/bibtex.c	2023-08-19 15:10:30 UTC (rev 67983)
+++ trunk/Build/source/texk/bibtex-x/bibtex.c	2023-08-19 15:26:18 UTC (rev 67984)
@@ -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"

Modified: trunk/Build/source/texk/bibtex-x/sysdep.h
===================================================================
--- trunk/Build/source/texk/bibtex-x/sysdep.h	2023-08-19 15:10:30 UTC (rev 67983)
+++ trunk/Build/source/texk/bibtex-x/sysdep.h	2023-08-19 15:26:18 UTC (rev 67984)
@@ -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
 
 /*-
 **============================================================================

Modified: trunk/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test	2023-08-19 15:10:30 UTC (rev 67983)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtex8u-mem.test	2023-08-19 15:26:18 UTC (rev 67984)
@@ -69,7 +69,7 @@
     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 \
@@ -76,7 +76,7 @@
     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