date.c: only use the TZ names if we don't have anything better.

diff --git a/cache.h b/cache.h
index 4ef80c392adb19df21a779edab366f99b7850e54..af6345820f3f8c533868394059b2d3b189e6b422 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -17,6 +17,19 @@
 #include SHA1_HEADER
 #include <zlib.h>
 
+#if ZLIB_VERNUM < 0x1200
+#define deflateBound(c,s)  ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
+#endif
+
+#ifdef DT_UNKNOWN
+#define DTYPE(de)      ((de)->d_type)
+#else
+#define DT_UNKNOWN     0
+#define DT_DIR         1
+#define DT_REG         2
+#define DTYPE(de)      DT_UNKNOWN
+#endif
+
 /*
  * Basic data structures for the directory cache
  *
@@ -143,8 +156,28 @@ extern int error(const char *err, ...);
 
 extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
 
-extern void *read_tree_with_tree_or_commit_sha1(const unsigned char *sha1,
-                                               unsigned long *size,
-                                               unsigned char *tree_sha1_ret);
+extern void *read_object_with_reference(const unsigned char *sha1,
+                                       const unsigned char *required_type,
+                                       unsigned long *size,
+                                       unsigned char *sha1_ret);
+
+void parse_date(char *date, char *buf, int bufsize);
+void datestamp(char *buf, int bufsize);
+
+static inline void *xmalloc(int size)
+{
+       void *ret = malloc(size);
+       if (!ret)
+               die("Out of memory, malloc failed");
+       return ret;
+}
+
+static inline void *xrealloc(void *ptr, int size)
+{
+       void *ret = realloc(ptr, size);
+       if (!ret)
+               die("Out of memory, realloc failed");
+       return ret;
+}
 
 #endif /* CACHE_H */