minor update of XeTeX header files

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

6 files changed, 17 insertions, 9 deletions

diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
index fd15b685249..19ad4025d98 100644
--- a/Build/source/m4/kpse-icu-flags.m4
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@ AC_DEFUN([KPSE_ICU_XETEX_FLAGS],
 # Internal subroutine.
 #
 # LIBNAME and OPTIONS as for _KPSE_LIB_FLAGS().
-# MORE-ICU-LIBS: icu libraries from the TL in addition to icuuc and icudata.
+# MORE-ICU-LIBS: icu libraries from the TL tree in addition to icuuc and icudata.
 m4_define([_KPSE_ICU_FLAGS],
 [_KPSE_LIB_FLAGS([icu], [$1], [$2],
                  [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include],
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 0fdc02689f9..355e0f0cee1 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* XeTeXFontInst.h: Fix prototype for xmalloc().
+
+	* XeTeXFontMgr_FC.cpp, XeTeX_ext.c: Move (nested) extern
+	declaration of gFreeTypeLibrary from here ...
+	* XeTeX_ext.h: ... to here.
+
 2011-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* XeTeXOTLayoutEngine.{cpp,h}: Drop support for ICU < 4.2.
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
index 793a6c5a06b..ed7a2c78d5b 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h
@@ -57,7 +57,7 @@ authorization from the copyright holders.
 #include "XeTeX_ext.h"
 
 extern "C" {
-	void *xmalloc(unsigned);	// from kpathsea
+	void *xmalloc(size_t);	// from kpathsea
 };
 
 // Abstract superclass that XeTeXOTLayoutEngine uses;
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
index 57c1201c0a5..b2e3687fc8c 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
@@ -52,8 +52,6 @@ static UConverter*	macRomanConv = NULL;
 static UConverter*	utf16beConv = NULL;
 static UConverter*	utf8Conv = NULL;
 
-extern FT_Library	gFreeTypeLibrary; /* shared with XeTeXFontInst_FT2 */
-
 static char*
 convertToUtf8(UConverter* conv, const unsigned char* name, int len)
 {
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index b65205c1cb6..1650e762e7e 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -65,9 +65,6 @@ authorization from the copyright holders.
 
 #include "XeTeX_ext.h"
 
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
 #include <teckit/TECkit_Engine.h>
 
 #include <kpathsea/c-ctype.h>
@@ -193,7 +190,6 @@ void initversionstring(char **versions)
 #ifdef XETEX_OTHER
 	int	fc_version = FcGetVersion();
 #endif
-	extern FT_Library	gFreeTypeLibrary; /* in XeTeXFontInst_FT2 */
 	FT_Int	ftMajor, ftMinor, ftPatch;
 
 	const_string fmt =
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index 50bfc39ba5d..c4b9d4c7a4d 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -212,6 +212,12 @@ extern const UInt32 byteMark;
 extern const char *papersize;
 extern const char *outputdriver;
 
+/* gFreeTypeLibrary is defined in XeTeXFontInst_FT2.cpp,
+ * also used in XeTeXFontMgr_FC.cpp and XeTeX_ext.c.  */
+#include <ft2build.h>
+#include FT_FREETYPE_H
+extern FT_Library gFreeTypeLibrary;
+
 #include <stdio.h> /* for FILE */
 
 #include "trans.h"