summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-02 11:33:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-02 11:33:10 +0000
commit1a1b0ed4deb7d7cc36e95917da86d9a7fcd50e8f (patch)
treee897f1cfee62018dc582abc1ce9255747a463923 /Build
parent654fa41b0ba10cfc74e8f492458f2ddbdd177c57 (diff)
XeTeX: Make sure <w2c/config.h> is always included first
git-svn-id: svn://tug.org/texlive/trunk@31067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp7
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.h8
-rw-r--r--Build/source/texk/web2c/xetexdir/hz.cpp8
-rw-r--r--Build/source/texk/web2c/xetexdir/image/bmpimage.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/image/bmpimage.h4
-rw-r--r--Build/source/texk/web2c/xetexdir/image/jpegimage.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/image/pngimage.h4
-rw-r--r--Build/source/texk/web2c/xetexdir/pdfimage.cpp8
16 files changed, 90 insertions, 19 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 6214af6775e..eac4522fd31 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * XeTeXFontInst.cpp, XeTeXFontInst_Mac.cpp, XeTeXFontMgr.cpp,
+ XeTeXFontMgr_FC.cpp, XeTeXFontMgr_Mac.mm,
+ XeTeXLayoutInterface.cpp, XeTeXOTMath.cpp, XeTeX_ext.c,
+ hz.cpp, pdfimage.cpp: Always first include <w2c/config.h>.
+ * XeTeX_ext.h: Do not include <w2c/config.h>.
+ * image/bmpimage.[ch], image/jpegimage.[ch]: First include
+ <w2c/config.h> in C files and not in headers.
+
2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* XeTeXFontInst.h: Include "XeTeXFontMgr.h" before <stdio.h>.
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
index fd13178e858..a6cd3785c4c 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp
@@ -39,6 +39,14 @@ authorization from the copyright holders.
* originally based on PortableFontInstance.cpp from ICU
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include "XeTeXFontInst.h"
#include "XeTeXLayoutInterface.h"
#include "XeTeX_ext.h"
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
index f0e0fa47543..895e5432f36 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
@@ -39,6 +39,13 @@ authorization from the copyright holders.
* created by: Jonathan Kew
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
#include "XeTeXFontInst_Mac.h"
#include "XeTeX_ext.h"
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
index 84dea428393..27eb5782d2e 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
@@ -30,6 +30,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#ifdef XETEX_MAC
#include "XeTeXFontMgr_Mac.h"
#else
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
index 16a471e35e8..f7c64d16f4b 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp
@@ -30,6 +30,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include "XeTeXFontMgr_FC.h"
/* allow compilation with old Fontconfig header */
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm
index 9cd84fbf1b3..6d818a0f386 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm
@@ -31,6 +31,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include "XeTeXFontMgr_Mac.h"
#include <Cocoa/Cocoa.h>
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
index c87b84416d1..0e99efa88ec 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
@@ -31,6 +31,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include <unicode/platform.h> // We need this first
#include <unicode/ubidi.h>
#include <unicode/utext.h>
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
index 3d2bae0d1ca..3f43d6272c5 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
@@ -31,6 +31,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include <assert.h>
#include "XeTeXOTMath.h"
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index be439173db2..242e7a644d5 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -36,9 +36,7 @@ authorization from the copyright holders.
* additional plain C extensions for XeTeX - mostly platform-neutral
*/
-/* We must include this first to avoid conflicting eof() declarations
- from mingw32's <io.h> and web2c/lib/lib.h. */
-#include <kpathsea/config.h>
+#include <w2c/config.h>
#ifdef XETEX_OTHER
#include "poppler-config.h"
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index c6e0b953d2d..4b28cb0a6b6 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -35,15 +35,7 @@ authorization from the copyright holders.
#ifndef __XETEXEXT_H
#define __XETEXEXT_H
-#include <w2c/c-auto.h> /* needed for SIZEOF_LONG and NO_DUMP_SHARE */
#include <unicode/utypes.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <w2c/config.h>
-#ifdef __cplusplus
-}
-#endif
#ifndef XETEX_UNICODE_FILE_DEFINED
typedef struct UFILE* unicodefile;
diff --git a/Build/source/texk/web2c/xetexdir/hz.cpp b/Build/source/texk/web2c/xetexdir/hz.cpp
index 00765bde879..927bb3cdf10 100644
--- a/Build/source/texk/web2c/xetexdir/hz.cpp
+++ b/Build/source/texk/web2c/xetexdir/hz.cpp
@@ -27,6 +27,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include "XeTeX_ext.h"
#include <map>
diff --git a/Build/source/texk/web2c/xetexdir/image/bmpimage.c b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
index 27310327e36..8900f5299b5 100644
--- a/Build/source/texk/web2c/xetexdir/image/bmpimage.c
+++ b/Build/source/texk/web2c/xetexdir/image/bmpimage.c
@@ -50,6 +50,10 @@
* BMP SUPPORT:
*/
+#if HAVE_CONFIG_H
+#include <w2c/config.h>
+#endif
+
#include "bmpimage.h"
#define DIB_FILE_HEADER_SIZE 14
diff --git a/Build/source/texk/web2c/xetexdir/image/bmpimage.h b/Build/source/texk/web2c/xetexdir/image/bmpimage.h
index cef4f8b27ad..c9f8b5b7c50 100644
--- a/Build/source/texk/web2c/xetexdir/image/bmpimage.h
+++ b/Build/source/texk/web2c/xetexdir/image/bmpimage.h
@@ -50,10 +50,6 @@
#ifndef _BMPIMAGE_H_
#define _BMPIMAGE_H_
-#if HAVE_CONFIG_H
-#include <w2c/config.h>
-#endif
-
#include "mfileio.h"
struct bmp_info {
diff --git a/Build/source/texk/web2c/xetexdir/image/jpegimage.c b/Build/source/texk/web2c/xetexdir/image/jpegimage.c
index e35844785eb..0f1fe05cb4b 100644
--- a/Build/source/texk/web2c/xetexdir/image/jpegimage.c
+++ b/Build/source/texk/web2c/xetexdir/image/jpegimage.c
@@ -75,6 +75,10 @@
* Level 2.
*/
+#if HAVE_CONFIG_H
+#include <w2c/config.h>
+#endif
+
#include "mfileio.h"
#include "numbers.h"
diff --git a/Build/source/texk/web2c/xetexdir/image/pngimage.h b/Build/source/texk/web2c/xetexdir/image/pngimage.h
index a908244da08..3286ea6ace5 100644
--- a/Build/source/texk/web2c/xetexdir/image/pngimage.h
+++ b/Build/source/texk/web2c/xetexdir/image/pngimage.h
@@ -50,10 +50,6 @@
#ifndef _PNGIMAGE_H_
#define _PNGIMAGE_H_
-#if HAVE_CONFIG_H
-#include <w2c/config.h>
-#endif
-
#include "mfileio.h"
struct png_info {
diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
index 8b7bc40d167..fac84953c5f 100644
--- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp
+++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
@@ -30,6 +30,14 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <w2c/config.h>
+#ifdef __cplusplus
+}
+#endif
+
#include "XeTeX_ext.h"
#include "pdfimage.h"