Revert to original FcFontSetMatch algorithm to avoid losing fonts.

[fontconfig.git] / src / fcfs.c

diff --git a/src/fcfs.c b/src/fcfs.c
index cbb5dc7f0d3985fb9485114963690283eae879f6..fdc15d7c2f7ed2d1cb8ed7af03795c0314e8a3d2 100644 (file)
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 FcFontSet *
 FcFontSetCreate (void)
@@ -113,7 +113,7 @@ FcFontSetNeededBytes (FcFontSet *s)
 int
 FcFontSetNeededBytesAlign (void)
 {
-    return __alignof__(int) + 
+    return fc_alignof (int) + 
        FcPatternNeededBytesAlign () + FcObjectNeededBytesAlign ();
 }
 
@@ -123,12 +123,12 @@ FcFontSetDistributeBytes (FcCache * metadata, void * block_ptr)
     block_ptr = ALIGN (block_ptr, int);
     fcfs_pat_count = (int *)block_ptr;
     block_ptr = (int *)block_ptr + 1;
-    // we don't consume any bytes for the fontset itself,
-    // since we don't allocate it statically.
+    /* we don't consume any bytes for the fontset itself, */
+    /* since we don't allocate it statically. */
     block_ptr = FcPatternDistributeBytes (metadata, block_ptr);
 
-    // for good measure, write out the object ids used for
-    // this bank to the file.
+    /* for good measure, write out the object ids used for */
+    /* this bank to the file. */
     return FcObjectDistributeBytes (metadata, block_ptr);
 }