summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorLuigi Scarso <luigi.scarso@gmail.com>2025-01-09 16:04:31 +0000
committerLuigi Scarso <luigi.scarso@gmail.com>2025-01-09 16:04:31 +0000
commit1a33052861efb4de9958a632cb820d0f7ba69805 (patch)
tree2646c833aef22a62ed6ce0fd4cc57f2cf8b66d19 /Build/source/texk/web2c/luatexdir
parentab03ac67bc2e70ba2a16d957f5e2b26073684db1 (diff)
replaced # error with # define UNSUPPORTED_ARCH in ffi.[ch]; small clean-up; LuaTeX 1.20.3HEADtrunk
git-svn-id: svn://tug.org/texlive/trunk@73383 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.c2
-rw-r--r--Build/source/texk/web2c/luatexdir/luaffi/ffi.c8
-rw-r--r--Build/source/texk/web2c/luatexdir/luaffi/ffi.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfdest.c2
7 files changed, 14 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index bfb003a4835..ead56e3c32e 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,4 +1,8 @@
2025-01-04 Luigi Scarso <luigi.scarso@gmail.com>
+ * replaced # error with # define UNSUPPORTED_ARCH in ffi.[ch]
+ * LuaTeX 1.20.3
+
+2025-01-04 Luigi Scarso <luigi.scarso@gmail.com>
* ffi.h: do not assume that struct cdata is aligned(16).
* More fixes for luaffi.
* LuaTeX 1.20.2
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c
index daad05fc38b..1b932a29ca2 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.c
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c
@@ -69,7 +69,7 @@ const_string LUATEX_IHELP[] = {
"",
" The following regular options are understood: ",
"",
- " --cnf-line =STRING parse STRING as a configuration file line",
+ " --cnf-line=STRING parse STRING as a configuration file line",
" --credits display credits and exit",
" --debug-format enable format debugging",
" --draftmode switch on draft mode (generates no output PDF)",
diff --git a/Build/source/texk/web2c/luatexdir/luaffi/ffi.c b/Build/source/texk/web2c/luatexdir/luaffi/ffi.c
index 7ead6af3d25..35e2a9e4d02 100644
--- a/Build/source/texk/web2c/luatexdir/luaffi/ffi.c
+++ b/Build/source/texk/web2c/luatexdir/luaffi/ffi.c
@@ -3751,14 +3751,14 @@ static int setup_upvals(lua_State* L)
lua_pushboolean(L, 1);
lua_setfield(L, -2, "64bit");
#else
-#error
+# define UNSUPPORTED_ARCH /*error*/
#endif
#if defined ARCH_X86 || defined ARCH_X64 || defined ARCH_ARM ||defined(ARCH_ARM64)|| defined ARCH_PPC64
lua_pushboolean(L, 1);
lua_setfield(L, -2, "le");
#else
-#error
+# define UNSUPPORTED_ARCH /*error*/
#endif
#if defined ARCH_X86 || defined ARCH_X64 || defined ARCH_PPC64 ||defined(ARCH_ARM64)
@@ -3773,7 +3773,7 @@ static int setup_upvals(lua_State* L)
lua_setfield(L, -2, "softfp");
#endif
#else
-#error
+# define UNSUPPORTED_ARCH /*error*/
#endif
lua_pop(L, 1); /* abi tbl */
@@ -3820,7 +3820,7 @@ static int setup_upvals(lua_State* L)
#elif defined ARCH_PPC64
lua_pushliteral(L, "ppc64");
#else
-# error
+# define UNSUPPORTED_ARCH /* error */
#endif
lua_setfield(L, 1, "arch");
diff --git a/Build/source/texk/web2c/luatexdir/luaffi/ffi.h b/Build/source/texk/web2c/luatexdir/luaffi/ffi.h
index f4aec6e66e1..9588dac5245 100644
--- a/Build/source/texk/web2c/luatexdir/luaffi/ffi.h
+++ b/Build/source/texk/web2c/luatexdir/luaffi/ffi.h
@@ -120,7 +120,7 @@ struct jit;
#elif defined __powerpc64__
# define ARCH_PPC64
#else
-# UNSUPPORTED_ARCH /*error*/
+# define UNSUPPORTED_ARCH /*error*/
#endif
/* See ffi.c: replace luaopen_ffi with a stub */
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 68ca8f11d0d..64ffde85079 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -33,8 +33,8 @@
*/
int luatex_version = 120;
-int luatex_revision = '2';
-const char *luatex_version_string = "1.20.2";
+int luatex_revision = '3';
+const char *luatex_version_string = "1.20.3";
const char *engine_name = my_name;
#include <kpathsea/c-ctype.h>
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 888484ec2f7..80d2a4dbd4e 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1,4 +1,4 @@
#ifndef luatex_svn_revision_h
#define luatex_svn_revision_h
-#define luatex_svn_revision 7638
+#define luatex_svn_revision 7640
#endif
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfdest.c b/Build/source/texk/web2c/luatexdir/pdf/pdfdest.c
index 0a0da0f89ff..be51bac8a30 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfdest.c
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfdest.c
@@ -309,7 +309,7 @@ static int dest_cmp(const void *a, const void *b)
void sort_dest_names(PDF pdf)
{
- qsort(pdf->dest_names, (size_t) pdf->dest_names_ptr, sizeof(dest_name_entry), dest_cmp);
+ qsort(pdf->dest_names, (size_t) pdf->dest_names_ptr, sizeof(dest_name_entry), dest_cmp);
}
/*tex