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/dvipng | |
| 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/dvipng')
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/dvipng-1.14/pk.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog index 1e057bcdd1c..77dd844fe5c 100644 --- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog +++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2014-11-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-07-w64-ptr: Fixed a typo. + 2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-07-w64-ptr: Avoid WIN64 warning due to different size. diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr index 585e1d91288..59c74420322 100644 --- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr +++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr @@ -1,13 +1,13 @@ diff -ur -x COPYING.gd dvipng-1.14.orig/pk.c dvipng-1.14/pk.c --- dvipng-1.14.orig/pk.c 2010-02-11 15:09:10.000000000 +0100 -+++ dvipng-1.14/pk.c 2014-07-14 19:59:20.000000000 +0200 ++++ dvipng-1.14/pk.c 2014-11-05 12:13:12.000000000 +0100 @@ -345,8 +345,13 @@ /* Read char definitions */ position = skip_specials(position); while (*position != PK_POST) { +#ifdef _WIN64 + DEBUG_PRINT(DEBUG_PK,("\n @%I64d PK CHAR:\t%d", -+ (__int64)position - (_int64)tfontp->fmmap.data, *position)); ++ (__int64)position - (__int64)tfontp->fmmap.data, *position)); +#else DEBUG_PRINT(DEBUG_PK,("\n @%ld PK CHAR:\t%d", (long)position - (long)tfontp->fmmap.data, *position)); diff --git a/Build/source/texk/dvipng/dvipng-1.14/pk.c b/Build/source/texk/dvipng/dvipng-1.14/pk.c index 303db8f5132..0806bc778e0 100644 --- a/Build/source/texk/dvipng/dvipng-1.14/pk.c +++ b/Build/source/texk/dvipng/dvipng-1.14/pk.c @@ -347,7 +347,7 @@ void InitPK(struct font_entry * tfontp) while (*position != PK_POST) { #ifdef _WIN64 DEBUG_PRINT(DEBUG_PK,("\n @%I64d PK CHAR:\t%d", - (__int64)position - (_int64)tfontp->fmmap.data, *position)); + (__int64)position - (__int64)tfontp->fmmap.data, *position)); #else DEBUG_PRINT(DEBUG_PK,("\n @%ld PK CHAR:\t%d", (long)position - (long)tfontp->fmmap.data, *position)); |