[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcarch.c   |    4 ----
 src/fccache.c  |    3 ---
 src/fccompat.c |    4 ----
 src/fchash.c   |    3 ---
 src/fcstat.c   |    3 ---
 5 files changed, 17 deletions(-)

New commits:
commit 43f768b53f554cf0f927ccac5daf96877f9fc69c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Sep 26 17:46:26 2013 +0900

    avoid reading config.h twice
    
    config.h is read from fcint.h now so having a line of the sort of #include "config.h"
    is duplicate.
    
    Bug 69833 - Incorrect SIZEOF_VOID_P and ALIGNOF_DOUBLE definitions causes nasty warnings on MacOSX when building fat libraries

diff --git a/src/fcarch.c b/src/fcarch.c
index 21516ff..398f4bb 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -23,10 +23,6 @@
 
 #include <stdio.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "fcint.h"
 #include "fcarch.h"
 
diff --git a/src/fccache.c b/src/fccache.c
index e02d49e..3568595 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -20,9 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include "fcarch.h"
 #include <stdio.h>
diff --git a/src/fccompat.c b/src/fccompat.c
index d4f88c8..1c2ba8b 100644
--- a/src/fccompat.c
+++ b/src/fccompat.c
@@ -25,10 +25,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "fcint.h"
 
 #include <errno.h>
diff --git a/src/fchash.c b/src/fchash.c
index 7216bee..3830002 100644
--- a/src/fchash.c
+++ b/src/fchash.c
@@ -23,9 +23,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/src/fcstat.c b/src/fcstat.c
index ab56aca..ff8e884 100644
--- a/src/fcstat.c
+++ b/src/fcstat.c
@@ -20,9 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include "fcarch.h"
 #include <dirent.h>