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>

diff --git a/abspath.c b/abspath.c
index 40cdc46219d4eba87ba947d9f5556eb80dfdfa9b..64adbe2a1b5e5679fb0dc772452b4aca1865ee4c 100644 (file)
--- 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];
 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);
        if (!pfx_len || is_absolute_path(arg))
                return arg;
        memcpy(path, pfx, pfx_len);

diff --git a/compat/terminal.c b/compat/terminal.c
index 9b5e3d1bb8fe0adafb78721c09caff5b165dbf40..313897d581f0c5f2eae4d09b82d6ff8b98a21ea4 100644 (file)
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -3,7 +3,7 @@
 #include "sigchain.h"
 #include "strbuf.h"
 
 #include "sigchain.h"
 #include "strbuf.h"
 

-#if defined(HAVE_DEV_TTY) || defined(WIN32)
+#if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)

 
 static void restore_term(void);
 
 
 static void restore_term(void);
 


@@ -53,7 +53,7 @@ static int disable_echo(void)
        return -1;
 }
 
        return -1;
 }
 

-#elif defined(WIN32)
+#elif defined(GIT_WINDOWS_NATIVE)

 
 #define INPUT_PATH "CONIN$"
 #define OUTPUT_PATH "CONOUT$"
 
 #define INPUT_PATH "CONIN$"
 #define OUTPUT_PATH "CONOUT$"

diff --git a/compat/win32.h b/compat/win32.h
index 8ce91048deffc17bdf8d51672ddaa0c867052ac5..a97e880757b6f1328fea90371da8f857648e6923 100644 (file)
--- a/compat/win32.h
+++ b/compat/win32.h
@@ -2,7 +2,7 @@
 #define WIN32_H
 
 /* common Win32 functions for MinGW and Cygwin */
 #define WIN32_H
 
 /* common Win32 functions for MinGW and Cygwin */

-#ifndef WIN32         /* Not defined by Cygwin */
+#ifndef GIT_WINDOWS_NATIVE     /* Not defined for Cygwin */

 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

diff --git a/diff-no-index.c b/diff-no-index.c
index 74da659368e4db67715a9c81dc7a5e0edcd3bcce..e66fdf33da9e3dd3da561aadffec938e6bc2ad49 100644 (file)
--- 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;
 
        if (!path || !strcmp(path, "/dev/null"))
                *mode = 0;

-#ifdef _WIN32
+#ifdef GIT_WINDOWS_NATIVE

        else if (!strcasecmp(path, "nul"))
                *mode = 0;
 #endif
        else if (!strcasecmp(path, "nul"))
                *mode = 0;
 #endif

diff --git a/git-compat-util.h b/git-compat-util.h
index e955bb5e8b3101cc8c753cf541beabf5cd037b39..eeed5069729f07aeb6beff073d010f1cf6f229e9 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -85,13 +85,14 @@
 #define _NETBSD_SOURCE 1
 #define _SGI_SOURCE 1
 
 #define _NETBSD_SOURCE 1
 #define _SGI_SOURCE 1
 

-#ifdef WIN32 /* Both MinGW and MSVC */
+#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */

 # if defined (_MSC_VER)
 #  define _WIN32_WINNT 0x0502
 # endif
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>
 #include <windows.h>
 # if defined (_MSC_VER)
 #  define _WIN32_WINNT 0x0502
 # endif
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>
 #include <windows.h>

+#define GIT_WINDOWS_NATIVE

 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

diff --git a/help.c b/help.c
index 02ba043319932411e90121d4147f25395782dfb5..3d70d7a3fe3b87059833e3dee52d943fff5184d7 100644 (file)
--- a/help.c
+++ b/help.c
@@ -106,7 +106,7 @@ static int is_executable(const char *name)
            !S_ISREG(st.st_mode))
                return 0;
 
            !S_ISREG(st.st_mode))
                return 0;
 

-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__)

 #if defined(__CYGWIN__)
 if ((st.st_mode & S_IXUSR) == 0)
 #endif
 #if defined(__CYGWIN__)
 if ((st.st_mode & S_IXUSR) == 0)
 #endif

diff --git a/run-command.c b/run-command.c
index 1b32a12a29b64fcc7d8b2401b00fb8a70ff81bad..aece872e331caa28bf515c98f5cceb27d8414dff 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -72,7 +72,7 @@ static inline void close_pair(int fd[2])
        close(fd[1]);
 }
 
        close(fd[1]);
 }
 

-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE

 static inline void dup_devnull(int to)
 {
        int fd = open("/dev/null", O_RDWR);
 static inline void dup_devnull(int to)
 {
        int fd = open("/dev/null", O_RDWR);


@@ -159,7 +159,7 @@ static const char **prepare_shell_cmd(const char **argv)
                die("BUG: shell command is empty");
 
        if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
                die("BUG: shell command is empty");
 
        if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {

-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE

                nargv[nargc++] = SHELL_PATH;
 #else
                nargv[nargc++] = "sh";
                nargv[nargc++] = SHELL_PATH;
 #else
                nargv[nargc++] = "sh";


@@ -182,7 +182,7 @@ static const char **prepare_shell_cmd(const char **argv)
        return nargv;
 }
 
        return nargv;
 }
 

-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE

 static int execv_shell_cmd(const char **argv)
 {
        const char **nargv = prepare_shell_cmd(argv);
 static int execv_shell_cmd(const char **argv)
 {
        const char **nargv = prepare_shell_cmd(argv);


@@ -193,7 +193,7 @@ static int execv_shell_cmd(const char **argv)
 }
 #endif
 
 }
 #endif
 

-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE

 static int child_err = 2;
 static int child_notifier = -1;
 
 static int child_err = 2;
 static int child_notifier = -1;
 


@@ -334,7 +334,7 @@ int start_command(struct child_process *cmd)
        trace_argv_printf(cmd->argv, "trace: run_command:");
        fflush(NULL);
 
        trace_argv_printf(cmd->argv, "trace: run_command:");
        fflush(NULL);
 

-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE

 {
        int notify_pipe[2];
        if (pipe(notify_pipe))
 {
        int notify_pipe[2];
        if (pipe(notify_pipe))

diff --git a/test-chmtime.c b/test-chmtime.c
index 02b42badd550a4b775aab084b38a63c2f4f561a9..1cffa126569b359720a2442af065d1e7a6a9593f 100644 (file)
--- a/test-chmtime.c
+++ b/test-chmtime.c
@@ -87,7 +87,7 @@ int main(int argc, const char *argv[])
                        return -1;
                }
 
                        return -1;
                }
 

-#ifdef WIN32
+#ifdef GIT_WINDOWS_NATIVE

                if (!(sb.st_mode & S_IWUSR) &&
                                chmod(argv[i], sb.st_mode | S_IWUSR)) {
                        fprintf(stderr, "Could not make user-writable %s: %s",
                if (!(sb.st_mode & S_IWUSR) &&
                                chmod(argv[i], sb.st_mode | S_IWUSR)) {
                        fprintf(stderr, "Could not make user-writable %s: %s",

diff --git a/thread-utils.c b/thread-utils.c
index 7f4b76a95899cc28aa1d42598d1649f126980ed9..97396a75ae4fc3f118750dd687fba85e3fc526cc 100644 (file)
--- a/thread-utils.c
+++ b/thread-utils.c
@@ -24,7 +24,7 @@ int online_cpus(void)
        long ncpus;
 #endif
 
        long ncpus;
 #endif
 

-#ifdef _WIN32
+#ifdef GIT_WINDOWS_NATIVE

        SYSTEM_INFO info;
        GetSystemInfo(&info);
 
        SYSTEM_INFO info;
        GetSystemInfo(&info);