Code

Don't use empty structure initializers.
authorFlorian Forster <octo@verplant.org>
Sun, 18 Jun 2006 15:18:07 +0000 (17:18 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 19 Jun 2006 04:19:10 +0000 (21:19 -0700)
Empty initializers for structures are not allowed in ANSI C99. This patch
removes such an initializer from `builtin-read-tree.c'. Since the struct was
static (and is therefore implicitely initialized to zero anyway) it wasn't
actually needed.

Signed-off-by: Florian Forster <octo@verplant.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-read-tree.c

index 04506da892c1bfb198c706e166efe8a2bf6cf1be..9a2099d7307903d62c85f3483a22969ab5094c84 100644 (file)
@@ -31,8 +31,7 @@ static int merge_size = 0;
 
 static struct object_list *trees = NULL;
 
-static struct cache_entry df_conflict_entry = {
-};
+static struct cache_entry df_conflict_entry;
 
 struct tree_entry_list {
        struct tree_entry_list *next;