diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 11:19:00 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 11:19:00 +0000 |
commit | a2abec3329d1437cb6c7b309325d64f65ddb962f (patch) | |
tree | d07a07911c2b4f40fcd0ac683367d9b0d65b55be /Build/source/texk | |
parent | beb5cd01dc68de7225916fafbd1ff2bb0bb338e5 (diff) |
XeTeX: Avoid MinGW name conflict
git-svn-id: svn://tug.org/texlive/trunk@30899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/pdfimage.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index f774702e089..5ea1ca2046d 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,9 @@ +2013-05-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pdfimage.cpp [MINGW]: Include kpathsea/mingw32.h (via + XeTeX_ext.h) before PDFDoc.h etc to avoid conflicting typedef of + boolean from rpcndr.h. + 2013-03-27 Khaled Hosny <khaledhosny@eglug.org> XeTeX 0.9999.2 diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp index 8b3a9e3ba09..8eb32a63a92 100644 --- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp +++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp @@ -32,6 +32,8 @@ authorization from the copyright holders. #include "pdfimage.h" +#include "XeTeX_ext.h" + #include "PDFDoc.h" #include "Catalog.h" #include "Page.h" |