From 9f87b631ce988d9c122c6321db9603d6a6bab93e Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 3 May 2010 14:44:12 -0600
Subject: [PATCH] build: prefer WIN32 over __MINGW32__ checks

WIN32 is always defined when __MINGW32__ is defined, but the
converse is not true.  WIN32 is more generic, if someone were
to ever attempt porting to a microsoft compiler.  This does
not affect Cygwin, which intentionally does not define WIN32.

* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Use more
generic flag macro.
* src/storage/storage_backend.c
(virStorageBackendUpdateVolTargetInfoFD)
(virStorageBackendRunProgRegex): Likewise.
* tools/console.h (vshRunConsole): Likewise.
---
 src/qemu/qemu_driver.c        | 2 +-
 src/storage/storage_backend.c | 8 ++++----
 tools/console.c               | 6 +++---
 tools/console.h               | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 08cff00d8b..704f82425c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9080,7 +9080,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom,
     }
 
     if (S_ISREG(sb.st_mode)) {
-#ifndef __MINGW32__
+#ifndef WIN32
         info->physical = (unsigned long long)sb.st_blocks *
             (unsigned long long)DEV_BSIZE;
 #else
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 5003b8c6b4..be87a81d98 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -954,7 +954,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
 
     if (allocation) {
         if (S_ISREG(sb.st_mode)) {
-#ifndef __MINGW32__
+#ifndef WIN32
             *allocation = (unsigned long long)sb.st_blocks *
                           (unsigned long long)DEV_BSIZE;
 #else
@@ -1184,7 +1184,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool,
 }
 
 
-#ifndef __MINGW32__
+#ifndef WIN32
 /*
  * Run an external program.
  *
@@ -1466,7 +1466,7 @@ virStorageBackendRunProgNul(virStoragePoolObjPtr pool,
     return 0;
 }
 
-#else
+#else /* WIN32 */
 
 int
 virStorageBackendRunProgRegex(virConnectPtr conn,
@@ -1494,4 +1494,4 @@ virStorageBackendRunProgNul(virConnectPtr conn,
     virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("%s not implemented on Win32"), __FUNCTION__);
     return -1;
 }
-#endif
+#endif /* WIN32 */
diff --git a/tools/console.c b/tools/console.c
index 4201ba4fc9..60e62e2c06 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -1,7 +1,7 @@
 /*
  * console.c: A dumb serial console client
  *
- * Copyright (C) 2007, 2008 Red Hat, Inc.
+ * Copyright (C) 2007, 2008, 2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#ifndef __MINGW32__
+#ifndef WIN32
 
 # include <stdio.h>
 # include <sys/types.h>
@@ -197,4 +197,4 @@ int vshRunConsole(const char *tty) {
     return ret;
 }
 
-#endif /* !__MINGW32__ */
+#endif /* !WIN32 */
diff --git a/tools/console.h b/tools/console.h
index 683f1cbad2..d0df78db1b 100644
--- a/tools/console.h
+++ b/tools/console.h
@@ -1,7 +1,7 @@
 /*
  * console.c: A dumb serial console client
  *
- * Copyright (C) 2007 Red Hat, Inc.
+ * Copyright (C) 2007, 2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,10 +23,10 @@
 #ifndef __VIR_CONSOLE_H__
 # define __VIR_CONSOLE_H__
 
-# ifndef __MINGW32__
+# ifndef WIN32
 
 int vshRunConsole(const char *tty);
 
-# endif /* !__MINGW32__ */
+# endif /* !WIN32 */
 
 #endif /* __VIR_CONSOLE_H__ */
-- 
GitLab