X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=0dcd2fe53b6aa7b19d963e130ce5fd4dea2389bc;hb=6e7722e6f88c049f43a1c00c45c502542d1a5752;hp=e7f5a2e16fa86111b576f9fae558cbbda2f1a050;hpb=6c5f9baa3bc0d63e141e0afc23110205379905a4;p=git.git

diff --git a/cache.h b/cache.h
index e7f5a2e1..0dcd2fe5 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
@@ -100,7 +104,7 @@ struct cache_entry {
 	unsigned int ce_size;
 	unsigned char sha1[20];
 	unsigned short ce_flags;
-	char name[];
+	char name[0];
 };
 
 #define CE_NAMEMASK  (0x0fff)
@@ -283,7 +287,7 @@ extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
 extern struct alternate_object_database {
 	struct alternate_object_database *next;
 	char *name;
-	char base[]; /* more */
+	char base[0]; /* more */
 } *alt_odb_list;
 extern void prepare_alt_odb(void);
 
@@ -296,7 +300,7 @@ extern struct packed_git {
 	unsigned int pack_last_used;
 	unsigned int pack_use_cnt;
 	unsigned char sha1[20];
-	char pack_name[]; /* something like ".git/objects/pack/xxxxx.pack" */
+	char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
 } *packed_git;
 
 struct pack_entry {
@@ -309,8 +313,9 @@ 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[];
+	char name[0];
 };
 
 extern int git_connect(int fd[2], char *url, const char *prog);