diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:30:20 -0700 |
| commit | e936318aa61760a8fe02557bd3c241136613fb34 (patch) | |
| tree | 0c6eba82cb2eecd1a462e702e93aa89b55370462 /diff-no-index.c | |
| parent | a62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff) | |
| parent | 83ff1da3e81824eebf0425ad9200248ea7205c35 (diff) | |
| download | git-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz | |
Merge branch 'rj/mingw-cygwin'
Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
ahead.
* rj/mingw-cygwin:
cygwin: Remove the CYGWIN_V15_WIN32API build variable
mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 74da659368..e66fdf33da 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -45,7 +45,7 @@ static int get_mode(const char *path, int *mode) if (!path || !strcmp(path, "/dev/null")) *mode = 0; -#ifdef _WIN32 +#ifdef GIT_WINDOWS_NATIVE else if (!strcasecmp(path, "nul")) *mode = 0; #endif |