X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=f0c9b01aa394c0a9a356f4b661141b77a0d7c9f6;hb=2ab141a26f93c4d97e243a6be8a38a7dd4eb35a3;hp=ba5c4ab7eea18ac4782d5f31a80330f8b487f1b0;hpb=f1d090e13a46d30a14089de0575dbb2fc44a583a;p=git.git

diff --git a/cache.h b/cache.h
index ba5c4ab7..f0c9b01a 100644
--- a/cache.h
+++ b/cache.h
@@ -58,7 +58,11 @@
  * We accept older names for now but warn.
  */
 extern char *gitenv_bc(const char *);
+#ifdef __GNUC__
 #define gitenv(e) (getenv(e) ? : gitenv_bc(e))
+#else
+#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
+#endif
 
 /*
  * Basic data structures for the directory cache
@@ -309,6 +313,7 @@ struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
+	unsigned char force;
 	struct ref *peer_ref; /* when renaming */
 	char name[0];
 };
@@ -322,7 +327,7 @@ extern int get_ack(int fd, unsigned char *result_sha1);
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(unsigned char *sha1, 
+extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
 						char *idx_path);
 
 extern void prepare_packed_git(void);