[Fontconfig] fontconfig: Branch 'master' - 4 commits

[Behdad Esfahbod]

 fc-cat/fc-cat.c   |   10 ++++------
 fc-lang/fc-lang.c |   11 -----------
 src/fcarch.c      |    9 ---------
 test/Makefile.am  |    2 +-
 test/run-test.sh  |    4 ++--
 5 files changed, 7 insertions(+), 29 deletions(-)

New commits:
commit 6bfef3ca4e52bdd5216facb90faa043c845aa0f6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 31 17:21:07 2012 -0600

    Make tests run on Windows

diff --git a/test/Makefile.am b/test/Makefile.am
index 72da8d6..4adcb17 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
 check_SCRIPTS=run-test.sh
-TESTS_ENVIRONMENT=src=${srcdir} sh
+TESTS_ENVIRONMENT=src=${srcdir} EXEEXT=${EXEEXT} sh
 TESTS=run-test.sh
 
 TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
diff --git a/test/run-test.sh b/test/run-test.sh
index e7174b2..24ca296 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -6,8 +6,8 @@ CACHEDIR=`pwd`/cache.dir
 
 ECHO=true
 
-FCLIST=../fc-list/fc-list
-FCCACHE=../fc-cache/fc-cache
+FCLIST=../fc-list/fc-list$EXEEXT
+FCCACHE=../fc-cache/fc-cache$EXEEXT
 
 FONT1=$TESTDIR/4x6.pcf
 FONT2=$TESTDIR/8x16.pcf
commit b1630dc00e3538a8fc6629ddbbba5435bfb2bd7a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 31 17:20:29 2012 -0600

    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)
commit a0638ff0c7445925e873b39dbe584fbaf3cc87e5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 31 17:20:12 2012 -0600

    Remove unneeded stuff

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index 72912b7..9a2abb3 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -67,17 +67,15 @@ extern int optind, opterr, optopt;
 #endif
 
 /*
- * POSIX has broken stdio so that getc must do thread-safe locking,
+ * POSIX has broken stdio so that putc must do thread-safe locking,
  * this is a serious performance problem for applications doing large
- * amounts of IO with getc (as is done here).  If available, use
- * the getc_unlocked varient instead.
+ * amounts of IO with putc (as is done here).  If available, use
+ * the putc_unlocked varient instead.
  */
  
-#if defined(getc_unlocked) || defined(_IO_getc_unlocked)
-#define GETC(f) getc_unlocked(f)
+#if defined(putc_unlocked) || defined(_IO_putc_unlocked)
 #define PUTC(c,f) putc_unlocked(c,f)
 #else
-#define GETC(f) getc(f)
 #define PUTC(c,f) putc(c,f)
 #endif
 
diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 93200c4..83b13e1 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -37,16 +37,6 @@
  * functions are also needed in slightly modified form
  */
 
-void
-FcMemAlloc (int kind, int size)
-{
-}
-
-void
-FcMemFree (int kind, int size)
-{
-}
-
 FcPrivate void
 FcCacheObjectReference (void *object)
 {
@@ -260,7 +250,6 @@ static int compare (const void *a, const void *b)
 #define MAX_LANG_SET_MAP    ((MAX_LANG + 31) / 32)
 
 #define BitSet(map, i)   ((map)[(entries[i].id)>>5] |= ((FcChar32) 1 << ((entries[i].id) & 0x1f)))
-#define BitGet(map, i)   ((map)[(entries[i].id)>>5] >> ((entries[i].id) & 0x1f)) & 1)
 
 int
 main (int argc, char **argv)
commit a603be89cd13555d5992836531c5ef2ba88b8473
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 31 17:00:19 2012 -0600

    Unbreak build when FC_ARCHITECTURE is defined

diff --git a/src/fcarch.c b/src/fcarch.c
index 8e6a8c4..545967f 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -27,14 +27,14 @@
 #include <config.h>
 #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 "fcint.h"
-
 #include "fcarch.h"
 
 FC_ASSERT_STATIC (1 == sizeof (char));