X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=ft2.h;h=aa203be552e2add9564022191595e103701f10b4;hb=104177db8b51eaa81208bd2b01f79b61d39cead0;hp=6c1cf8129cdbba13037ec97975b0942be8a40ca3;hpb=24b560185c2574f2898583ba2c8fc40a01b95885;p=xonotic%2Fdarkplaces.git

diff --git a/ft2.h b/ft2.h
index 6c1cf812..aa203be5 100644
--- a/ft2.h
+++ b/ft2.h
@@ -22,7 +22,11 @@
 
 typedef struct ft2_font_map_s ft2_font_map_t;
 typedef struct ft2_attachment_s ft2_attachment_t;
+#ifdef WIN64
+#define ft2_oldstyle_map ((ft2_font_map_t*)-1LL)
+#else
 #define ft2_oldstyle_map ((ft2_font_map_t*)-1)
+#endif
 
 typedef float ft2_kernvec[2];
 typedef struct ft2_kerning_s
@@ -43,7 +47,7 @@ typedef struct ft2_font_s
 
 	// TODO: clean this up and do not expose everything.
 	
-	//unsigned char  *data;
+	const unsigned char  *data; // FT2 needs it to stay
 	//fs_offset_t     datasize;
 	void           *face;
 
@@ -55,6 +59,8 @@ typedef struct ft2_font_s
 	size_t            attachmentcount;
 	ft2_attachment_t *attachments;
 
+	ft2_settings_t *settings;
+
 	// fallback mechanism
 	struct ft2_font_s *next;
 } ft2_font_t;