aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src/fcint.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-29 09:06:20 +0200
committermarha <marha@users.sourceforge.net>2012-05-29 09:06:20 +0200
commit3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8 (patch)
tree4f945d98347a8e736e66af191c0ada59a6ad0a81 /fontconfig/src/fcint.h
parente514bce90660eb2ec76f50af13866f84da93ec60 (diff)
parentce592e25d6303a8f4a8aa0e2918e0f72a35bf175 (diff)
downloadvcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.gz
vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.bz2
vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.zip
Merge remote-tracking branch 'origin/released'
Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
Diffstat (limited to 'fontconfig/src/fcint.h')
-rw-r--r--fontconfig/src/fcint.h26
1 files changed, 22 insertions, 4 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h
index 46562c4ca..8c42ff2d9 100644
--- a/fontconfig/src/fcint.h
+++ b/fontconfig/src/fcint.h
@@ -360,7 +360,7 @@ struct _FcCache {
intptr_t dirs; /* offset to subdirs */
int dirs_count; /* number of subdir strings */
intptr_t set; /* offset to font set */
- int mtime; /* low bits of directory mtime */
+ int checksum; /* checksum of directory state */
};
#undef FcCacheDir
@@ -541,6 +541,13 @@ struct _FcRange {
FcChar32 end;
};
+typedef struct _FcStatFS FcStatFS;
+
+struct _FcStatFS {
+ FcBool is_remote_fs;
+ FcBool is_mtime_broken;
+};
+
/* fcblanks.c */
/* fccache.c */
@@ -569,9 +576,6 @@ FcCacheFini (void);
FcPrivate void
FcDirCacheReference (FcCache *cache, int nref);
-FcPrivate int
-FcStat (const FcChar8 *file, struct stat *statb);
-
/* fccfg.c */
FcPrivate FcChar8 *
@@ -1022,6 +1026,20 @@ extern FcPrivate const FcMatrix FcIdentityMatrix;
FcPrivate void
FcMatrixFree (FcMatrix *mat);
+/* fcstat.c */
+
+FcPrivate int
+FcStat (const FcChar8 *file, struct stat *statb);
+
+FcPrivate int
+FcStatChecksum (const FcChar8 *file, struct stat *statb);
+
+FcPrivate FcBool
+FcIsFsMmapSafe (int fd);
+
+FcPrivate FcBool
+FcIsFsMtimeBroken (const FcChar8 *dir);
+
/* fcstr.c */
FcPrivate void
FcStrSetSort (FcStrSet * set);