From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 31 Dec 2012 23:20:29 +0000 (-0600)
Subject: Enable fcarch assert checks even when FC_ARCHITECTURE is explicitly given
X-Git-Tag: 2.10.91~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1630dc00e3538a8fc6629ddbbba5435bfb2bd7a;p=platform%2Fupstream%2Ffontconfig.git

Enable fcarch assert checks even when FC_ARCHITECTURE is explicitly given

After all, if the asserts fail, the resulting library simply can't be
working correctly.
---

diff --git a/src/fcarch.c b/src/fcarch.c
index 545967f..35734c0 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -28,13 +28,6 @@
 #endif
 
 #include "fcint.h"
-
-/* If architecture is hardcoded, skip the assert tests */
-
-#ifndef FC_ARCHITECTURE
-
-/* Make sure the cache structure is consistent with what we expect */
-
 #include "fcarch.h"
 
 FC_ASSERT_STATIC (1 == sizeof (char));
@@ -62,8 +55,6 @@ FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
 FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));
 FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
 
-#endif
-
 
 int
 main (int argc FC_UNUSED, char **argv FC_UNUSED)