summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-30 16:02:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-30 16:02:15 +0000
commit11b46b2232dae52dc269537ca46f392a0f1690f7 (patch)
treed1e6ba25f6f718a7d886556033a94b28a3c71580 /Build
parent35daa72a9b2a9d7c7e458f79e84f426a62040c28 (diff)
still more pdftex headers
git-svn-id: svn://tug.org/texlive/trunk@18054 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex-common.h5
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.cc9
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftoepdf.h11
4 files changed, 23 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index c7d8f1db271..183a72a8296 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftoepdf.h: #include "openbsd-compat.h" as early as possible.
+ Add #include <kpathsea/lib.h> and drop decl of const_string.
+ * pdftex-common.h (xstrdup): Remove decl (in <kpathsea/lib.h>).
+ (pdfosmode): Declare as boolean as generated by Web2C.
+ * pdftoepdf.cc: Avoid MINGW32's typedef of boolean, conflicting
+ with <kpathsea/types.h>.
+
2010-04-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* epdf.c, pdftoepdf.cc, writeenc.c: Change various function
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex-common.h b/Build/source/texk/web2c/pdftexdir/pdftex-common.h
index 42e42e23379..4ddac5f39cf 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex-common.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftex-common.h
@@ -29,9 +29,6 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#ifndef PDFTEX_COMMON_H
# define PDFTEX_COMMON_H
-/* FIXME: from ../../kpathsea/lib.h */
-extern KPSEDLL char *xstrdup (const char *);
-
/* Generated from pdftex.web:
these declarations are included in ptexlib.h via pdftexd.h,
we repeat them here for pdftoepdf.h and as consistency check.
@@ -53,7 +50,7 @@ extern longinteger pdfptr;
extern integer poolptr;
extern eightbits *pdfbuf;
extern integer pdfbufsize;
-extern int pdfosmode; /* Web's boolean */
+extern boolean pdfosmode;
extern eightbits pdflastbyte;
extern integer fixedinclusioncopyfont;
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index 6e846b6023a..40a1102046b 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -18,6 +18,12 @@ with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+/* For MINGW32 <rpcndr.h> defines 'boolean' as 'unsigned char',
+ conflicting with the definition for Pascal's boolean as 'int'
+ in <kpathsea/types.h>.
+*/
+#define boolean MINGW32_boolean
+
#include <stdlib.h>
#include <math.h>
#include <stddef.h>
@@ -39,6 +45,9 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <gfile.h>
#include <assert.h>
#endif
+
+#undef boolean
+
#include "Object.h"
#include "Stream.h"
#include "Array.h"
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.h b/Build/source/texk/web2c/pdftexdir/pdftoepdf.h
index a37ebe87c53..a8d753aefa5 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.h
@@ -24,15 +24,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
extern "C" {
+#include "openbsd-compat.h"
+
#include <kpathsea/c-auto.h>
#include <kpathsea/c-proto.h>
-
-/* the following code is extremly ugly but needed for including web2c/config.h */
-
- typedef const char *const_string; /* including kpathsea/types.h doesn't work on some systems */
+#include <kpathsea/lib.h>
#define KPATHSEA_CONFIG_H /* avoid including other kpathsea header files */
- /* from web2c/config.h */
+ /* from web2c/config.h */
#ifdef CONFIG_H /* CONFIG_H has been defined by some xpdf */
# undef CONFIG_H /* header file */
@@ -43,8 +42,6 @@ extern "C" {
#include <pdftexdir/ptexmac.h>
-#include "openbsd-compat.h"
-
#include "pdftex-common.h"
}