Marius Storm-Olsen <mstormo@xxxxxxxxx> writes:
> From: Frank Li <lznuaa@xxxxxxxxx>
>
> The code which is conditional on MinGW32 is actually conditional on Windows.
> Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments,
> but not by Cygwin.
>
> Signed-off-by: Frank Li <lznuaa@xxxxxxxxx>
> Signed-off-by: Marius Storm-Olsen <mstormo@xxxxxxxxx>
The description sounds very sensible; I wish I read this one first, before
wasting time scratching my head while reading 03/17. Shouldn't that patch
be squashed into this one?
> ---
> help.c | 2 +-
> pager.c | 4 ++--
> run-command.c | 8 ++++----
> run-command.h | 2 +-
> setup.c | 2 +-
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/help.c b/help.c
> index fd51b8e..e8db31f 100644
> --- a/help.c
> +++ b/help.c
> @@ -126,7 +126,7 @@ static int is_executable(const char *name)
> !S_ISREG(st.st_mode))
> return 0;
>
> -#ifdef __MINGW32__
> +#ifdef WIN32
> { /* cannot trust the executable bit, peek into the file instead */
> char buf[3] = { 0 };
> int n;
> diff --git a/pager.c b/pager.c
> index f416d38..86facec 100644
> --- a/pager.c
> +++ b/pager.c
> @@ -9,7 +9,7 @@
>
> static int spawned_pager;
>
> -#ifndef __MINGW32__
> +#ifndef WIN32
> static void pager_preexec(void)
> {
> /*
> @@ -72,7 +72,7 @@ void setup_pager(void)
> static const char *env[] = { "LESS=FRSX", NULL };
> pager_process.env = env;
> }
> -#ifndef __MINGW32__
> +#ifndef WIN32
> pager_process.preexec_cb = pager_preexec;
> #endif
> if (start_command(&pager_process))
> diff --git a/run-command.c b/run-command.c
> index 91f6d2e..cb006e7 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -75,7 +75,7 @@ fail_pipe:
>
> trace_argv_printf(cmd->argv, "trace: run_command:");
>
> -#ifndef __MINGW32__
> +#ifndef WIN32
> fflush(NULL);
> cmd->pid = fork();
> if (!cmd->pid) {
> @@ -315,7 +315,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
> return run_command(&cmd);
> }
>
> -#ifdef __MINGW32__
> +#ifdef WIN32
> static unsigned WINAPI run_thread(void *data)
> {
> struct async *async = data;
> @@ -331,7 +331,7 @@ int start_async(struct async *async)
> return error("cannot create pipe: %s", strerror(errno));
> async->out = pipe_out[0];
>
> -#ifndef __MINGW32__
> +#ifndef WIN32
> /* Flush stdio before fork() to avoid cloning buffers */
> fflush(NULL);
>
> @@ -360,7 +360,7 @@ int start_async(struct async *async)
>
> int finish_async(struct async *async)
> {
> -#ifndef __MINGW32__
> +#ifndef WIN32
> int ret = wait_or_whine(async->pid, "child process", 0);
> #else
> DWORD ret = 0;
> diff --git a/run-command.h b/run-command.h
> index 0c00b25..fb34209 100644
> --- a/run-command.h
> +++ b/run-command.h
> @@ -70,7 +70,7 @@ struct async {
> int (*proc)(int fd, void *data);
> void *data;
> int out; /* caller reads from here and closes it */
> -#ifndef __MINGW32__
> +#ifndef WIN32
> pid_t pid;
> #else
> HANDLE tid;
> diff --git a/setup.c b/setup.c
> index e3781b6..029371e 100644
> --- a/setup.c
> +++ b/setup.c
> @@ -41,7 +41,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
> const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
> {
> static char path[PATH_MAX];
> -#ifndef __MINGW32__
> +#ifndef WIN32
> if (!pfx || !*pfx || is_absolute_path(arg))
> return arg;
> memcpy(path, pfx, pfx_len);
> --
> 1.6.2.1.418.g33d56.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html