From 53d41bfc8e123b5324bb47a85a6d68c4f115fdda Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 18 Oct 2012 07:12:58 +0000 Subject: pdfTeX: Reduce TL vs W32TeX diffs (Win32/MinGW build problem) git-svn-id: svn://tug.org/texlive/trunk@28011 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/pdftexdir/pdftoepdf.cc | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'Build/source/texk/web2c/pdftexdir') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 62eced410bc..47fadaeed09 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-10-18 Peter Breitenlohner + + * pdftoepdf.cc: #include early to avoid problems + with the definition of boolean in for MINGW32. + 2012-10-09 Peter Breitenlohner The openbsd compat library is no longer used. diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc index 5f601734eaf..b291cd58bef 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc @@ -17,11 +17,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* For MINGW32 defines 'boolean' as 'unsigned char', - conflicting with the definition for Pascal's boolean as 'int' - in . +/* Do this early in order to avoid a conflict between + MINGW32 defining 'boolean' as 'unsigned char' and + defining Pascal's boolean as 'int'. */ -#define boolean MINGW32_boolean +extern "C" { +#include +#include +} #include #include @@ -58,23 +61,12 @@ with this program. If not, see . #include "GlobalParams.h" #include "Error.h" -#undef boolean - // This file is mostly C and not very much C++; it's just used to interface // the functions of xpdf, which happens to be written in C++. extern "C" { - -#include -#include -#include - -#include /* define SIZEOF_LONG */ -#include /* define type integer */ - #include #include - } // The prefix "PTEX" for the PDF keys is special to pdfTeX; -- cgit v1.2.3