diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:07:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:07:09 -0700 |
| commit | 642f7108f68ef622b338d27d94a956e32c8567dd (patch) | |
| tree | 32972655c14bdbd803e3842cb2220b9045632199 /diffcore.h | |
| parent | 7980e41746bc5de91eea775f9142ce44b1100361 (diff) | |
| parent | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (diff) | |
| download | git-642f7108f68ef622b338d27d94a956e32c8567dd.tar.gz | |
Merge branch 'maint'
* maint:
push: mention "git pull" in error message for non-fast forwards
Standardize do { ... } while (0) style
t/t7003: replace \t with literal tab in sed expression
index-pack: Don't follow replace refs.
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/diffcore.h b/diffcore.h index fed9b151b5..05ebc115a1 100644 --- a/diffcore.h +++ b/diffcore.h @@ -98,7 +98,7 @@ struct diff_queue_struct { (q)->queue = NULL; \ (q)->nr = (q)->alloc = 0; \ (q)->run = 0; \ - } while(0); + } while (0) extern struct diff_queue_struct diff_queued_diff; extern struct diff_filepair *diff_queue(struct diff_queue_struct *, @@ -118,9 +118,9 @@ void diff_debug_filespec(struct diff_filespec *, int, const char *); void diff_debug_filepair(const struct diff_filepair *, int); void diff_debug_queue(const char *, struct diff_queue_struct *); #else -#define diff_debug_filespec(a,b,c) do {} while(0) -#define diff_debug_filepair(a,b) do {} while(0) -#define diff_debug_queue(a,b) do {} while(0) +#define diff_debug_filespec(a,b,c) do { /* nothing */ } while (0) +#define diff_debug_filepair(a,b) do { /* nothing */ } while (0) +#define diff_debug_queue(a,b) do { /* nothing */ } while (0) #endif extern int diffcore_count_changes(struct diff_filespec *src, |