[cairo-commit] cairo/src cairo-atsui-font.c,1.11,1.12

[Tim Rowley]

Committed by: tor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv30973/src

Modified Files:
	cairo-atsui-font.c 
Log Message:
	* src/cairo-atsui-font.c: allow building against < 10.3 SDK.


Index: cairo-atsui-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-atsui-font.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cairo-atsui-font.c	3 Jun 2005 23:45:47 -0000	1.11
+++ cairo-atsui-font.c	21 Jun 2005 16:54:59 -0000	1.12
@@ -38,7 +38,19 @@
 #include "cairo-atsui.h"
 #include "cairoint.h"
 #include "cairo.h"
+#if 0
 #include <iconv.h>
+#endif
+
+/*
+ * FixedToFloat/FloatToFixed are 10.3+ SDK items - include definitions
+ * here so we can use older SDKs.
+ */
+#ifndef FixedToFloat
+#define fixed1              ((Fixed) 0x00010000L)
+#define FixedToFloat(a)     ((float)(a) / fixed1)
+#define FloatToFixed(a)     ((Fixed)((float)(a) * fixed1))
+#endif
 
 typedef struct {
     cairo_scaled_font_t base;