Accept TT_PLATFORM_MICROSOFT, TT_MS_ID_SYMBOL_CS from name table

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 437115894cfdd17d6fdb1c64ecfa6013e93b615c..8e80d1e415266698678ab3c52a7e17f7a13d7af7 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -107,10 +107,6 @@
 
 #define FC_MEM_NUM         30
 
-#define FC_BANK_DYNAMIC 0
-#define FC_BANK_FIRST 1
-#define FC_BANK_LANGS      0xfcfcfcfc
-
 #define FC_MIN(a,b) ((a) < (b) ? (a) : (b))
 #define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
 #define FC_ABS(a)   ((a) < 0 ? -(a) : (a))
@@ -257,7 +253,7 @@ struct _FcExprPage {
   FcExprPage *next_page;
   FcExpr *next;
   FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)];
-  FcExpr end[0];
+  FcExpr end[];
 };
 
 typedef enum _FcQual {
@@ -421,15 +417,6 @@ typedef struct _FcCaseFold {
 
 #define FC_MAX_FILE_LEN            4096
 
-/* XXX remove these when we're ready */
-
-#define fc_value_string(v)     FcValueString(v)
-#define fc_value_charset(v)    FcValueCharSet(v)
-#define fc_value_langset(v)    FcValueLangSet(v)
-#define fc_storage_type(v)     ((v)->type)
-
-#define fc_alignof(type) offsetof (struct { char c; type member; }, member)
-
 #define FC_CACHE_MAGIC_MMAP        0xFC02FC04
 #define FC_CACHE_MAGIC_ALLOC       0xFC02FC05
 #define FC_CACHE_CONTENT_VERSION    3 /* also check FC_CACHE_VERSION */
@@ -520,9 +507,6 @@ typedef struct _FcFileTime {
 
 typedef struct _FcCharMap FcCharMap;
 
-/* watch out; assumes that v is void * -PL */
-#define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1)))
-
 /* fcblanks.c */
 
 /* fccache.c */