X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=hcache.c;h=c34efd94657e5eeb39e139899a4d03f6344ae15d;hb=a548b928816889f8f2aa5bfe8f755d8234ce19db;hp=ed1cae5fa35a9b20b1b251d01f2b7f62be151703;hpb=93fff313ededa74d6b1350931a37744729498e3b;p=apps%2Fmadmutt.git

diff --git a/hcache.c b/hcache.c
index ed1cae5..c34efd9 100644
--- a/hcache.c
+++ b/hcache.c
@@ -18,11 +18,17 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# else
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
+# endif
 
 #if HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
+#endif				/* HAVE_CONFIG_H */
 
 #ifdef USE_HCACHE
 
@@ -66,7 +72,7 @@ header_cache
 typedef union
 {
         struct timeval timeval;
-        unsigned long long uid_validity;
+        uint64_t uid_validity;
 } validate;
 
 static void *
@@ -130,6 +136,7 @@ dump_char(char *c, unsigned char *d, int *off)
 	return d;
 }
 
+#if 0
 static unsigned char *
 dump_char_size(char *c, unsigned char *d, int *off, ssize_t size)
 {
@@ -146,6 +153,7 @@ dump_char_size(char *c, unsigned char *d, int *off, ssize_t size)
 
 	return d;
 }
+#endif
 
 static void
 restore_char(char **c, const unsigned char *d, int *off)
@@ -245,6 +253,7 @@ restore_list(LIST **l, const unsigned char *d, int *off)
 	*l = NULL;
 }
 
+#if 0
 static unsigned char *
 dump_buffer(BUFFER *b, unsigned char *d, int *off)
 {
@@ -281,6 +290,7 @@ restore_buffer(BUFFER **b, const unsigned char *d, int *off)
 	restore_int(& (*b)->dsize, d, off);
 	restore_int((unsigned int *) & (*b)->destroy, d, off);
 }
+#endif
 
 static unsigned char *
 dump_parameter(PARAMETER *p, unsigned char *d, int *off)
@@ -516,7 +526,7 @@ mutt_hcache_per_folder(const char *path, const char *folder)
 /* This function transforms a header into a char so that it is useable by
  * db_store */
 static void *
-mutt_hcache_dump(void *_db, HEADER *h, int *off, unsigned long long uid_validity)
+mutt_hcache_dump(void *_db, HEADER *h, int *off, uint64_t uid_validity)
 {
 	struct header_cache *db = _db;
 	unsigned char *d = NULL;
@@ -525,7 +535,7 @@ mutt_hcache_dump(void *_db, HEADER *h, int *off, unsigned long long uid_validity
 	d = lazy_malloc(sizeof(validate));
 
 	if (uid_validity) {
-		memcpy(d, &uid_validity, sizeof(long long));
+		memcpy(d, &uid_validity, sizeof(uint64_t));
 	} else {
 		struct timeval now;
 		gettimeofday(&now, NULL);
@@ -658,7 +668,7 @@ mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char *f
 }
 
 int
-mutt_hcache_store(void *db, const char *filename, HEADER *header, unsigned long long uid_validity, size_t (*keylen)(const char *fn))
+mutt_hcache_store(void *db, const char *filename, HEADER *header, uint64_t uid_validity, size_t (*keylen)(const char *fn))
 {
 	struct header_cache *h = db;
 	datum key;
@@ -839,7 +849,7 @@ mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char *f
 }
 
 int
-mutt_hcache_store(void *db, const char *filename, HEADER *header, unsigned long long uid_validity, size_t (*keylen)(const char *fn))
+mutt_hcache_store(void *db, const char *filename, HEADER *header, uint64_t uid_validity, size_t (*keylen)(const char *fn))
 {
 	DBT key;
 	DBT data;