From 91dda1bb3c6b41d1aa142affed77758e6022d92c Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周日, 07 1月 2018 20:01:32 +0800
Subject: [PATCH] fix header consistency

---
 src/library/pc-identifiers.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index e14c7a5..10c51b2 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -16,7 +16,11 @@
 #include <stdbool.h>
 #include <valgrind/memcheck.h>
 #else
+#ifdef __MINGW32__
+#include <windows.h>
+#else
 #include <Windows.h>
+#endif
 #endif
 
 static FUNCTION_RETURN generate_disk_pc_id(PcIdentifier * identifiers,
@@ -80,7 +84,11 @@
 			}
 		}
 end:
-		*num_identifiers = cmin(*num_identifiers, adapter_num * disk_num);
+#ifdef _MSC_VER
+        *num_identifiers = min(*num_identifiers, adapter_num * disk_num);
+#else
+        *num_identifiers = cmin(*num_identifiers, adapter_num * disk_num);
+#endif
 		free(diskInfoPtr);
 		free(adapterInfoPtr);
 	}

--
Gitblit v1.9.1