summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-02-19 13:58:24 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2013-02-19 13:58:24 +0000
commit46269cbc4c5e9e78c5159cae275f276c4c54e26a (patch)
tree734ab2482b411f64aae724fa567a8d84c796df26 /Build/source/texk
parent131edca4d85f78c64c1793725546350fc9ca62b2 (diff)
Fix 32 bit build on Mac
git-svn-id: svn://tug.org/texlive/trunk@29166 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/texmfmp.h7
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.h5
2 files changed, 3 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index a62ddcdb492..208a5c08774 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -7,12 +7,6 @@
#include <kpathsea/tex-make.h> /* for kpse_make_tex_discard_errors */
#ifdef XeTeX
-/* Include these two early in order to prevent typedef duplications. */
-#include <zlib.h>
-#include <teckit/TECkit_Common.h>
-#endif
-
-#ifdef XeTeX
/* added typedefs for unicodefile and voidpointer */
#define XETEX_UNICODE_FILE_DEFINED 1
typedef struct {
@@ -310,6 +304,7 @@ extern void paintrow (/*screenrow, pixelcolor, transspec, screencol*/);
/* We define the routines to do the actual work in texmf.c. */
#ifdef XeTeX
+#include <zlib.h>
extern void do_dump (char *, int, int, gzFile);
extern void do_undump (char *, int, int, gzFile);
#else
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index 73368232034..0d8047a96d1 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -62,7 +62,6 @@ typedef struct UFILE* unicodefile;
but otherwise we'll need these substitute definitions */
#ifdef XETEX_MAC
-#include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h>
#else
typedef int32_t Fixed;
@@ -305,7 +304,7 @@ typedef void* CFDictionaryRef; /* dummy declaration just so the stubs can compil
void GetGlyphHeightDepth_AAT(CFDictionaryRef fontAttrs, uint16_t gid, float* ht, float* dp);
void GetGlyphSidebearings_AAT(CFDictionaryRef fontAttrs, uint16_t gid, float* lsb, float* rsb);
double GetGlyphItalCorr_AAT(CFDictionaryRef fontAttrs, uint16_t gid);
- int MapCharToGlyph_AAT(CFDictionaryRef fontAttrs, uint32_t ch);
+ int MapCharToGlyph_AAT(CFDictionaryRef fontAttrs, UInt32 ch);
int MapGlyphToIndex_AAT(CFDictionaryRef attributes, const char* glyphName);
char* GetGlyphNameFromCTFont(CTFontRef ctFontRef, uint16_t gid, int* len);
int GetGlyphIDFromCTFont(CTFontRef ctFontRef, const char* glyphName);
@@ -318,7 +317,7 @@ typedef void* CFDictionaryRef; /* dummy declaration just so the stubs can compil
CTFontRef fontFromAttributes(CFDictionaryRef fontAttrs);
CTFontRef fontFromInteger(integer font);
void getGlyphBBoxFromCTFont(CTFontRef ctFontRef, uint16_t gid, GlyphBBox* bbox);
- int mapCharToGlyphFromCTFont(CTFontRef font, uint32_t ch, uint32_t vs);
+ int mapCharToGlyphFromCTFont(CTFontRef font, UInt32 ch, UInt32 vs);
double getGlyphWidthFromCTFont(CTFontRef font, uint16_t gid);
#endif
#ifdef __cplusplus