From cb8c987e8a3aa63064de053b8a19c0cab67b44f0 Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周日, 21 4月 2019 23:19:00 +0800
Subject: [PATCH] Merge pull request #1 from open-license-manager/master
---
src/library/pc-identifiers.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index e14c7a5..7332f4f 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);
}
@@ -145,7 +153,7 @@
return result_diskinfos;
}
diskInfos = (DiskInfo*) malloc(disk_num * sizeof(DiskInfo));
- //memset(diskInfos,0,disk_num * sizeof(DiskInfo));
+ memset(diskInfos,0,disk_num * sizeof(DiskInfo));
result_diskinfos = getDiskInfos(diskInfos, &disk_num);
if (result_diskinfos != FUNC_RET_OK) {
free(diskInfos);
--
Gitblit v1.9.1