[Fontconfig] fontconfig: Branch 'fc-2_4-keithp'

[Keith Packard]

 src/fcint.h       |    2 +-
 src/fcserialize.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree c50ea916b0e56520948804b67fc7df57bb490575 (from 76abb77f26c43d069919f80e960c71c2242fb5c2)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Wed Aug 30 23:09:39 2006 -0700

    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 651ca66..1b92d75 100644
--- 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 5a4b4af..a8c10b8 100644
--- 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;