diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-11-05 12:14:58 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-11-05 12:14:58 +0000 |
commit | 20316e76cda72a8e581f2456ae93139486f4e124 (patch) | |
tree | 292c334d025213555ea73bd22ec1878d3d03019e /Build/source/texk/lcdf-typetools | |
parent | 166fe2d6af0d6ac9b2701bd95cd6873e5e8c5808 (diff) |
MinGW64/WIN64 build fixes
git-svn-id: svn://tug.org/texlive/trunk@35517 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
3 files changed, 27 insertions, 2 deletions
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog index 9ccfa86dfeb..00cdb181c7b 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-win64 (new): Required for MinGW64. + 2014-07-08 Peter Breitenlohner <peb@mppmu.mpg.de> Import lcdf-typetools-2.104. diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64 new file mode 100644 index 00000000000..7f94fdc77bc --- /dev/null +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64 @@ -0,0 +1,21 @@ +diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.104.orig/liblcdf/error.cc lcdf-typetools-2.104/liblcdf/error.cc +--- lcdf-typetools-2.104.orig/liblcdf/error.cc 2013-09-17 15:40:15.000000000 +0200 ++++ lcdf-typetools-2.104/liblcdf/error.cc 2014-11-05 12:19:23.000000000 +0100 +@@ -320,7 +320,7 @@ + #define ErrH ErrorHandler + + static char * +-do_number(unsigned long num, char *after_last, int base, int flags) ++do_number(uintptr_t num, char *after_last, int base, int flags) + { + const char *digits = + ((flags & ErrH::cf_uppercase) ? "0123456789ABCDEF" : "0123456789abcdef"); +@@ -668,7 +668,7 @@ + } + void *v = va_arg(val, void *); + s2 = numbuf + NUMBUF_SIZE; +- s1 = do_number((unsigned long)v, (char *)s2, 16, flags); ++ s1 = do_number((uintptr_t)v, (char *)s2, 16, flags); + s1 = do_number_flags((char *)s1, (char *)s2, 16, flags | cf_alternate_form, + precision, field_width); + break; diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc index cfef2f07de9..8fe054b21ab 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc @@ -320,7 +320,7 @@ ErrorHandler::clean_landmark(const String &landmark, bool with_colon) #define ErrH ErrorHandler static char * -do_number(unsigned long num, char *after_last, int base, int flags) +do_number(uintptr_t num, char *after_last, int base, int flags) { const char *digits = ((flags & ErrH::cf_uppercase) ? "0123456789ABCDEF" : "0123456789abcdef"); @@ -668,7 +668,7 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val) } void *v = va_arg(val, void *); s2 = numbuf + NUMBUF_SIZE; - s1 = do_number((unsigned long)v, (char *)s2, 16, flags); + s1 = do_number((uintptr_t)v, (char *)s2, 16, flags); s1 = do_number_flags((char *)s1, (char *)s2, 16, flags | cf_alternate_form, precision, field_width); break; |