From: kramm <kramm>
Date: Sat, 5 Jul 2003 18:29:14 +0000 (+0000)
Subject: resolved conflict with MingW's FIXED type.
X-Git-Tag: release-0-5-0~202
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=c241bda9d7d9a4090072e7f5a34588b517639fdf

resolved conflict with MingW's FIXED type.
---

diff --git a/pdf2swf/ttf2pt1/ttf.h b/pdf2swf/ttf2pt1/ttf.h
index 8c38808..9f5c502 100644
--- a/pdf2swf/ttf2pt1/ttf.h
+++ b/pdf2swf/ttf2pt1/ttf.h
@@ -35,7 +35,7 @@
 typedef struct short_2 {
 	SHORT	upper;
 	USHORT	lower;
-} FIXED ;
+} TTF2PT1_FIXED ;
 
 typedef struct longhormetric {
 	UFWORD	advanceWidth;
@@ -159,7 +159,7 @@ typedef struct ttf_maxp {
 
 typedef struct ttf_post_head {
 	ULONG	formatType;
-	FIXED	italicAngle;
+	TTF2PT1_FIXED	italicAngle;
 	FWORD	underlinePosition;
 	FWORD	underlineThickness;
 	ULONG	isFixedPitch;