summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-18 07:12:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-18 07:12:58 +0000
commit53d41bfc8e123b5324bb47a85a6d68c4f115fdda (patch)
tree16059c0492ba3a8ca49324d9df2fa58b84a8ce5f
parent333a18522dac84dd8b7e49ad5ba74eeb7d7d5984 (diff)
pdfTeX: Reduce TL vs W32TeX diffs (Win32/MinGW build problem)
git-svn-id: svn://tug.org/texlive/trunk@28011 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc22
2 files changed, 12 insertions, 15 deletions
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 <peb@mppmu.mpg.de>
+
+ * pdftoepdf.cc: #include <w2c/config.h> early to avoid problems
+ with the definition of boolean in <rpcndr.h> for MINGW32.
+
2012-10-09 Peter Breitenlohner <peb@mppmu.mpg.de>
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 <http://www.gnu.org/licenses/>.
*/
-/* For MINGW32 <rpcndr.h> defines 'boolean' as 'unsigned char',
- conflicting with the definition for Pascal's boolean as 'int'
- in <kpathsea/types.h>.
+/* Do this early in order to avoid a conflict between
+ MINGW32 <rpcndr.h> defining 'boolean' as 'unsigned char' and
+ <kpathsea/types.h> defining Pascal's boolean as 'int'.
*/
-#define boolean MINGW32_boolean
+extern "C" {
+#include <w2c/config.h>
+#include <kpathsea/lib.h>
+}
#include <stdlib.h>
#include <math.h>
@@ -58,23 +61,12 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#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 <kpathsea/c-auto.h>
-#include <kpathsea/c-proto.h>
-#include <kpathsea/lib.h>
-
-#include <w2c/c-auto.h> /* define SIZEOF_LONG */
-#include <w2c/config.h> /* define type integer */
-
#include <pdftexdir/ptexmac.h>
#include <pdftexdir/pdftex-common.h>
-
}
// The prefix "PTEX" for the PDF keys is special to pdfTeX;