summaryrefslogtreecommitdiff
path: root/abspath.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-05-02 20:26:08 +0100
committerJunio C Hamano <gitster@pobox.com>2013-05-08 12:14:35 -0700
commit380395d094b49834c3ec804407853fd6e81de702 (patch)
tree1787e7dfeecf96244541790acb7cb0873892734b /abspath.c
parentb75cdfaa882a00f2274e74b21c1a9927d184ed29 (diff)
downloadgit-380395d094b49834c3ec804407853fd6e81de702.tar.gz
mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
Throughout git, it is assumed that the WIN32 preprocessor symbol is defined on native Windows setups (mingw and msvc) and not on Cygwin. On Cygwin, most of the time git can pretend this is just another Unix machine, and Windows-specific magic is generally counterproductive. Unfortunately Cygwin *does* define the WIN32 symbol in some headers. Best to rely on a new git-specific symbol GIT_WINDOWS_NATIVE instead, defined as follows: #if defined(WIN32) && !defined(__CYGWIN__) # define GIT_WINDOWS_NATIVE #endif After this change, it should be possible to drop the CYGWIN_V15_WIN32API setting without any negative effect. [rj: %s/WINDOWS_NATIVE/GIT_WINDOWS_NATIVE/g ] Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'abspath.c')
-rw-r--r--abspath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/abspath.c b/abspath.c
index 40cdc46219..64adbe2a1b 100644
--- a/abspath.c
+++ b/abspath.c
@@ -216,7 +216,7 @@ const char *absolute_path(const char *path)
const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
{
static char path[PATH_MAX];
-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE
if (!pfx_len || is_absolute_path(arg))
return arg;
memcpy(path, pfx, pfx_len);