diff options
| author | Gary V. Vaughan <git@mlists.thewrittenword.com> | 2010-05-14 13:31:35 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-01 03:59:27 +0400 |
| commit | 4b05548fc0523744b7a1276cfa0f4aae19d6d9c9 (patch) | |
| tree | baf4bc01f49247b8811ed5d87dede2456e8b5eff /merge-recursive.h | |
| parent | 48793cf46a286a21df420fdd7fc4b0c91c60a0c8 (diff) | |
enums: omit trailing comma for portability
Without this patch at least IBM VisualAge C 5.0 (I have 5.0.2) on AIX
5.1 fails to compile git.
enum style is inconsistent already, with some enums declared on one
line, some over 3 lines with the enum values all on the middle line,
sometimes with 1 enum value per line... and independently of that the
trailing comma is sometimes present and other times absent, often
mixing with/without trailing comma styles in a single file, and
sometimes in consecutive enum declarations.
Clearly, omitting the comma is the more portable style, and this patch
changes all enum declarations to use the portable omitted dangling
comma style consistently.
Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index d1192f56d7..344e47694c 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -10,7 +10,7 @@ struct merge_options { enum { MERGE_RECURSIVE_NORMAL = 0, MERGE_RECURSIVE_OURS, - MERGE_RECURSIVE_THEIRS, + MERGE_RECURSIVE_THEIRS } recursive_variant; const char *subtree_shift; unsigned buffer_output : 1; |