summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-03-16 01:59:10 -0500
committerJunio C Hamano <gitster@pobox.com>2011-03-16 12:31:32 -0700
commitc9b6782a08a728908bac8dc51def3607b3daa2a9 (patch)
tree0895c38c28ecbabb7c8f4a6cae74169b42d3a7a5
parentea2c69ed4728070be1d2ee953a6948398b859150 (diff)
downloadgit-c9b6782a08a728908bac8dc51def3607b3daa2a9.tar.gz
enums: omit trailing comma for portability
Since v1.7.2-rc0~23^2~2 (Add per-repository eol normalization, 2010-05-19), building with gcc -std=gnu89 -pedantic produces warnings like the following: convert.c:21:11: warning: comma at end of enumerator list [-pedantic] gcc is right to complain --- these commas are not permitted in C89. In the spirit of v1.7.2-rc0~32^2~16 (2010-05-14), remove them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
-rw-r--r--convert.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index c7b0a28352..39ca875fb5 100644
--- a/cache.h
+++ b/cache.h
@@ -570,7 +570,7 @@ extern enum safe_crlf safe_crlf;
enum auto_crlf {
AUTO_CRLF_FALSE = 0,
AUTO_CRLF_TRUE = 1,
- AUTO_CRLF_INPUT = -1,
+ AUTO_CRLF_INPUT = -1
};
extern enum auto_crlf auto_crlf;
diff --git a/convert.c b/convert.c
index d5aebed48d..7eb51b16ed 100644
--- a/convert.c
+++ b/convert.c
@@ -18,7 +18,7 @@ enum action {
CRLF_TEXT,
CRLF_INPUT,
CRLF_CRLF,
- CRLF_AUTO,
+ CRLF_AUTO
};
struct text_stat {