summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2008-04-29 08:03:54 +0000
committerTaco Hoekwater <taco@elvenkind.com>2008-04-29 08:03:54 +0000
commit3171b4c009441b9b6795a47cc3ac1e84b04b7907 (patch)
tree4490c85acecf2a894219bbe849a50167fff9bcf5
parent9dc89b36e8cb3adb1c66e104ce2322a5296db366 (diff)
luatex-on-aix compilation
git-svn-id: svn://tug.org/texlive/trunk@7719 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/luafontforge/fontforge/inc/basics.h11
-rw-r--r--Build/source/texk/web2c/web2c/coerce.h19
2 files changed, 27 insertions, 3 deletions
diff --git a/Build/source/libs/luafontforge/fontforge/inc/basics.h b/Build/source/libs/luafontforge/fontforge/inc/basics.h
index eb3781df017..97c172d4461 100644
--- a/Build/source/libs/luafontforge/fontforge/inc/basics.h
+++ b/Build/source/libs/luafontforge/fontforge/inc/basics.h
@@ -45,11 +45,16 @@
#define forever for (;;)
-/* typedef int32_t int32; */
+#ifndef _AIX
+
+typedef int32_t int32;
+typedef int16_t int16;
+typedef int8_t int8;
+
+#endif
+
typedef uint32_t uint32;
-/* typedef int16_t int16; */
typedef uint16_t uint16;
-/* typedef int8_t int8; */
typedef uint8_t uint8;
/* An integral type which can hold a pointer */
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index db0b13563d5..ddb0203eac3 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -7,6 +7,23 @@
Therefore, we have to redefine these macros so they don't cast
cast their argument (of type memoryword or fourquarters,
respectively). */
+
+#ifdef luaTeX
+
+#ifdef print_word
+#undef print_word
+#define print_word(x) zprint_word (x)
+#endif
+
+/* luatex doesn't have tfm_qqqq */
+
+#ifdef eq_destroy
+#undef eq_destroy
+#define eq_destroy(x) zeq_destroy(x)
+#endif
+
+#else /* luaTeX */
+
#ifdef printword
#undef printword
#define printword(x) zprintword (x)
@@ -22,6 +39,8 @@
#define eqdestroy(x) zeqdestroy(x)
#endif
+#endif
+
/* And we use the opportunity to declare a few functions that could not be
declared in texmfmp.h, because they need typedefs not yet known at that
point. */