diff options
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/texmfmp.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.h | 2 |
5 files changed, 21 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index f4cf8609c3a..6fc82569e9c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2013-01-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmfmp.h [XeTeX]: We must #include <zlib.h> and + <teckit/TECkit_Common.h> before "XeTeX_ext.h" to avoid typedef + duplications. + 2013-01-01 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, am/bootstrap.am, am/cweb.am: Do not distribute diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h index ce9c43500af..758c6bdf1f4 100644 --- a/Build/source/texk/web2c/texmfmp.h +++ b/Build/source/texk/web2c/texmfmp.h @@ -7,7 +7,9 @@ #include <kpathsea/tex-make.h> /* for kpse_make_tex_discard_errors */ #ifdef XeTeX +/* Include these two early in order to prevent typedef duplications. */ #include <zlib.h> +#include <teckit/TECkit_Common.h> #endif #ifdef XeTeX diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 031a60e45f2..499775b91a2 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,10 @@ +2013-01-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * XeTeX_ext.c: Use xcalloc() and strncpy() instead of strndup() + because there are systems without it, e.g., MinGW. + * xetex.h: Include "XeTeXOTMath.h" (protos for xetex.web). + * am/xetex.am: Drop obsolete files from XeTeX change file merge. + 2013-01-03 Khaled Hosny <khaledhosny@eglug.org> Merge changes from XeTeX repository. diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index 8833145f5c8..0334e2880d0 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -2,7 +2,7 @@ Part of the XeTeX typesetting system Copyright (c) 1994-2008 by SIL International Copyright (c) 2009, 2011 by Jonathan Kew - Copyright (c) 2012 by Khaled Hosny + Copyright (c) 2012, 2013 by Khaled Hosny SIL Author(s): Jonathan Kew @@ -973,12 +973,14 @@ loadOTfont(PlatformFontRef fontRef, XeTeXFont font, Fixed scaled_size, const cha } if (strncmp(cp1, "shaper", 6) == 0) { + char* tmpStr; cp3 = cp1 + 6; if (*cp3 != '=') goto bad_option; cp3 = cp1 + 7; shapers = xrealloc(shapers, (nShapers + 1) * sizeof(char *)); - shapers[nShapers++] = strndup(cp3, cp2 - cp3); + tmpStr = xcalloc(1, cp2 - cp3 + 1); + shapers[nShapers++] = strncpy(tmpStr, cp3, cp2 - cp3); goto next_option; } diff --git a/Build/source/texk/web2c/xetexdir/xetex.h b/Build/source/texk/web2c/xetexdir/xetex.h index a797ce8389b..b159a5668ef 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.h +++ b/Build/source/texk/web2c/xetexdir/xetex.h @@ -99,6 +99,8 @@ authorization from the copyright holders. #define otpartendconnector ot_part_end_connector #define otpartfulladvance ot_part_full_advance #define otminconnectoroverlap ot_min_connector_overlap +/* prototypes used in xetex.web */ +#include "XeTeXOTMath.h" /* Unicode file reading modes */ #define AUTO 0 /* default: will become one of 1..3 at file open time, after sniffing */ |