fix endianness issues with some luatex data structures for (un)dump

git-svn-id: svn://tug.org/texlive/trunk@19032 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 28 insertions, 4 deletions

diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 9a79b3ce618..50e10dd6f91 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-18  Taco Hoekwater <taco@luatex.org>
+
+	* tex/textoken.h (smemory_word): add endiannes test
+	* font/texfont.h (liginfo, kerninfo): add endianness test
+	* luatex_svnversion.h: new version
+
 2010-06-13  Taco Hoekwater <taco@luatex.org>
 
 	* tex/inputstack.h (in_state_record): force two bitfields to be signed,
diff --git a/Build/source/texk/web2c/luatexdir/font/texfont.h b/Build/source/texk/web2c/luatexdir/font/texfont.h
index 6a021726748..9281b19ec0d 100644
--- a/Build/source/texk/web2c/luatexdir/font/texfont.h
+++ b/Build/source/texk/web2c/luatexdir/font/texfont.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License along
    with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
 
-/* $Id: texfont.h 3482 2010-03-13 11:18:28Z taco $ */
+/* $Id: texfont.h 3723 2010-06-18 09:19:27Z taco $ */
 
 /* Here we have the interface to LuaTeX's font system, as seen from the
    main pascal program. There is a companion list in luatex.defines to
@@ -32,15 +32,28 @@
 
 #  define pointer halfword
 
+/* these are dumped en block, so they need endianness tests */
 typedef struct liginfo {
+#  ifdef WORDS_BIGENDIAN
     int adj;
     int lig;
-    char type;
+    int type;
+#else
+    int type;
+    int lig;
+    int adj;
+#endif
 } liginfo;
 
+/* these are dumped en block, so they need endianness tests */
 typedef struct kerninfo {
+#  ifdef WORDS_BIGENDIAN
     int adj;
     scaled sc;
+#else
+    scaled sc;
+    int adj;
+#endif
 } kerninfo;
 
 typedef struct extinfo {
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 6ad62585e79..176f7bbc88a 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 3720
+#define luatex_svn_revision 3723
diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.h b/Build/source/texk/web2c/luatexdir/tex/textoken.h
index 1cb4533a5d2..7af0bf4ee51 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textoken.h
+++ b/Build/source/texk/web2c/luatexdir/tex/textoken.h
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License along
    with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
 
-/* $Id: textoken.h 3376 2010-01-25 16:50:23Z taco $ */
+/* $Id: textoken.h 3723 2010-06-18 09:19:27Z taco $ */
 
 #ifndef TEXTOKEN_H
 #  define TEXTOKEN_H
@@ -45,8 +45,13 @@
 #  include "tex/stringpool.h"
 
 typedef struct smemory_word_ {
+#  ifdef WORDS_BIGENDIAN
     halfword hhrh;
     halfword hhlh;
+#else
+    halfword hhlh;
+    halfword hhrh;
+#endif
 } smemory_word;
 
 #  define fix_mem_init 10000