summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/texmfmem.h6
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.ch4
2 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/texmfmem.h b/Build/source/texk/web2c/texmfmem.h
index 8d227add06d..0596376013e 100644
--- a/Build/source/texk/web2c/texmfmem.h
+++ b/Build/source/texk/web2c/texmfmem.h
@@ -141,8 +141,7 @@ typedef union
/* fmemory_word for font_list; needs to be only four bytes. This saves
- significant space in the .fmt files. */
-
+ significant space in the .fmt files. (Not true in XeTeX, actually!) */
typedef union
{
#ifdef WORDS_BIGENDIAN
@@ -151,6 +150,9 @@ typedef union
#else /* not WORDS_BIGENDIAN */
struct
{
+#ifdef XeTeX
+ halfword junk; /* quarterword is really 16 bits in XeTeX, so integer does not fill the union */
+#endif
integer CINT;
} u;
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index af7279f6b8e..370023c96ce 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -65,7 +65,7 @@ authorization from SIL International.
@d XeTeX_version=0
@d XeTeX_revision==".999"
-@d XeTeX_version_string=='-0.999.2' {current \XeTeX\ version}
+@d XeTeX_version_string=='-0.999.3' {current \XeTeX\ version}
@z
@x
@@ -8720,7 +8720,7 @@ var
i: integer;
begin
begin_diagnostic;
- if warningType=0 then print_nl("Loaded font mapping `")
+ if warningType=0 then print_nl("Loaded mapping `")
else print_nl("Font mapping `");
print_utf8_str(mappingNameP, mappingNameLen);
print("' for font `");