From 6c5f9baa3bc0d63e141e0afc23110205379905a4 Mon Sep 17 00:00:00 2001 From: Jason Riedy Date: Tue, 23 Aug 2005 13:31:09 -0700 Subject: Replace zero-length array decls with []. C99 denotes variable-sized members with [], not [0]. Signed-off-by: Jason Riedy --- cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index ba5c4ab7ee..e7f5a2e16f 100644 --- a/cache.h +++ b/cache.h @@ -100,7 +100,7 @@ struct cache_entry { unsigned int ce_size; unsigned char sha1[20]; unsigned short ce_flags; - char name[0]; + char name[]; }; #define CE_NAMEMASK (0x0fff) @@ -283,7 +283,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[0]; /* more */ + char base[]; /* more */ } *alt_odb_list; extern void prepare_alt_odb(void); @@ -296,7 +296,7 @@ extern struct packed_git { unsigned int pack_last_used; unsigned int pack_use_cnt; unsigned char sha1[20]; - char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */ + char pack_name[]; /* something like ".git/objects/pack/xxxxx.pack" */ } *packed_git; struct pack_entry { @@ -310,7 +310,7 @@ struct ref { unsigned char old_sha1[20]; unsigned char new_sha1[20]; struct ref *peer_ref; /* when renaming */ - char name[0]; + char name[]; }; extern int git_connect(int fd[2], char *url, const char *prog); -- cgit v1.2.3 From c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc Mon Sep 17 00:00:00 2001 From: Jason Riedy Date: Tue, 23 Aug 2005 13:34:07 -0700 Subject: Fix ?: statements. Omitting the first branch in ?: is a GNU extension. Cute, but not supported by other compilers. Replaced mostly by explicit tests. Calls to getenv() simply are repeated on non-GNU compilers. Signed-off-by: Jason Riedy --- cache.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cache.h') diff --git a/cache.h b/cache.h index e7f5a2e16f..e4f4664572 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 -- cgit v1.2.3