diff options
author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /fontconfig/src | |
parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'fontconfig/src')
-rw-r--r-- | fontconfig/src/fcarch.c | 4 | ||||
-rw-r--r-- | fontconfig/src/fccache.c | 3 | ||||
-rw-r--r-- | fontconfig/src/fccompat.c | 4 | ||||
-rw-r--r-- | fontconfig/src/fchash.c | 3 | ||||
-rw-r--r-- | fontconfig/src/fcstat.c | 3 |
5 files changed, 0 insertions, 17 deletions
diff --git a/fontconfig/src/fcarch.c b/fontconfig/src/fcarch.c index 21516ff05..398f4bbfc 100644 --- a/fontconfig/src/fcarch.c +++ b/fontconfig/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/fontconfig/src/fccache.c b/fontconfig/src/fccache.c index e02d49e8f..3568595ed 100644 --- a/fontconfig/src/fccache.c +++ b/fontconfig/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/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c index ce4af5d0d..b685fade3 100644 --- a/fontconfig/src/fccompat.c +++ b/fontconfig/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/fontconfig/src/fchash.c b/fontconfig/src/fchash.c index 7216beead..38300028c 100644 --- a/fontconfig/src/fchash.c +++ b/fontconfig/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/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index 0263a0082..1f37cacf8 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/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> |