diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 12:16:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 12:16:17 +0200 |
| commit | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (patch) | |
| tree | 0b856002c12c11744627134553ef9cdfa77faead /fontconfig | |
| parent | 2d042f719910c5aa1ba9f4a47b21009c729c345e (diff) | |
| download | vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.gz vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.bz2 vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.zip | |
Synchronised files
Updated to latest gl specs
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/config.h | 5 | ||||
| -rw-r--r-- | fontconfig/src/fccompat.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fontconfig/config.h b/fontconfig/config.h index 593744bd3..441734857 100644 --- a/fontconfig/config.h +++ b/fontconfig/config.h @@ -10,4 +10,9 @@ #define HAVE__MKTEMP_S 1 #define FC_CACHEDIR getenv("TEMP") #define FC_DEFAULT_FONTS "fonts" +#ifdef _WIN64 +#define SIZEOF_VOID_P 8 +#else +#define SIZEOF_VOID_P 4 +#endif diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c index d4f88c83f..ce4af5d0d 100644 --- a/fontconfig/src/fccompat.c +++ b/fontconfig/src/fccompat.c @@ -221,7 +221,7 @@ FcRandom(void) } #ifdef _WIN32 -#include <direct.h> +#undef mkdir #define mkdir(path,mode) _mkdir(path) #endif |