From 9aaf7588fc70153bb7e2dac1d9266ca9adcc4c9a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 2 Mar 2017 08:17:35 +0800 Subject: [PATCH] glib/gmessages.c: Fix build when targeting Windows Vista+ In my previous attempt to improve colored console output on Windows, we called GetFileInformationByHandleEx() directly if we target Vista or later, but the check macro for doing so via LoadLibrary() had a typo. Fix this by correcting the check macro. Pointed out by Ignacio Casal Quinteiro. --- glib/gmessages.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glib/gmessages.c b/glib/gmessages.c index 1c62197ff..db40801a9 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -1487,7 +1487,7 @@ win32_is_pipe_tty (int fd) gint length; /* XXX: Remove once XP support really dropped */ -#if _WINNT_WIN32 < 0x0600 +#if _WIN32_WINNT < 0x0600 HANDLE h_kerneldll = NULL; fGetFileInformationByHandleEx *GetFileInformationByHandleEx; #endif @@ -1501,7 +1501,7 @@ win32_is_pipe_tty (int fd) /* mintty uses a pipe, in the form of \{cygwin|msys}-xxxxxxxxxxxxxxxx-ptyN-{from|to}-master */ /* XXX: Remove once XP support really dropped */ -#if _WINNT_WIN32 < 0x0600 +#if _WIN32_WINNT < 0x0600 h_kerneldll = LoadLibraryW (L"kernel32.dll"); if (h_kerneldll == NULL) @@ -1562,7 +1562,7 @@ done_query: g_free (info); /* XXX: Remove once XP support really dropped */ -#if _WINNT_WIN32 < 0x0600 +#if _WIN32_WINNT < 0x0600 if (h_kerneldll != NULL) FreeLibrary (h_kerneldll); #endif