Use intptr_t instead of off_t inside FcCache structure.

This avoids OS-dependencies in the cache file structure.

diff --git a/src/fcint.h b/src/fcint.h
index 651ca6627a0e9632ae03e61312aceb03a89ae5fa..1b92d75270bc63dcf83f75bb278d3cc50abe49d8 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -308,7 +308,7 @@ typedef struct _FcStrBuf {
 
 typedef struct _FcCache {
     int                magic;              /* FC_CACHE_MAGIC */
-    off_t      size;               /* size of file */
+    intptr_t   size;               /* size of file */
     intptr_t   dir;                /* offset to dir name */
     intptr_t   dirs;               /* offset to subdirs */
     int                dirs_count;         /* number of subdir strings */

diff --git a/src/fcserialize.c b/src/fcserialize.c
index 5a4b4aff67331b14fc0231fb76aca5c631056a84..a8c10b87d0592adecb2719b35ca5dedae79f7acc 100644 (file)
--- a/src/fcserialize.c
+++ b/src/fcserialize.c
@@ -26,7 +26,6 @@ typedef union _FcAlign {
     double     d;
     int                i;
     intptr_t   ip;
-    off_t      o;
     FcBool     b;
     void       *p;
 } FcAlign;