diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-13 11:42:04 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-13 11:42:04 +0200 |
| commit | d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a (patch) | |
| tree | b50ae20ca22bc564b145906d6c84395285933859 /fontconfig/src/fcint.h | |
| parent | 120bd371deb2b73a0bae5ce331511e4ea27bcff2 (diff) | |
| parent | fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff) | |
| download | vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.gz vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.bz2 vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/src/fcint.h')
| -rw-r--r-- | fontconfig/src/fcint.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index 56f77efef..0dfc23659 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -55,9 +55,17 @@ #endif #ifdef _WIN32 -#define FC_SEARCH_PATH_SEPARATOR ';' +# define _WIN32_WINNT 0x0500 +# define WIN32_LEAN_AND_MEAN +# define STRICT +# include <windows.h> +typedef UINT (WINAPI *pfnGetSystemWindowsDirectory)(LPSTR, UINT); +typedef HRESULT (WINAPI *pfnSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); +extern pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory; +extern pfnSHGetFolderPathA pSHGetFolderPathA; +# define FC_SEARCH_PATH_SEPARATOR ';' #else -#define FC_SEARCH_PATH_SEPARATOR ':' +# define FC_SEARCH_PATH_SEPARATOR ':' #endif #define FC_DBG_MATCH 1 @@ -1009,6 +1017,12 @@ FcStrBufData (FcStrBuf *buf, const FcChar8 *s, int len); FcPrivate int FcStrCmpIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2); +FcPrivate FcBool +FcStrRegexCmp (const FcChar8 *s, const FcChar8 *regex); + +FcPrivate FcBool +FcStrRegexCmpIgnoreCase (const FcChar8 *s, const FcChar8 *regex); + FcPrivate const FcChar8 * FcStrContainsIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2); |