From 35087e2c3f200639cf32c96e81cdbb08a5acb8eb Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 3月 2020 23:40:14 +0800
Subject: [PATCH] mingw
---
src/library/os/windows/os-win.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/library/os/windows/os-win.c b/src/library/os/windows/os-win.cpp
similarity index 90%
rename from src/library/os/windows/os-win.c
rename to src/library/os/windows/os-win.cpp
index ef56baf..d8d04eb 100644
--- a/src/library/os/windows/os-win.c
+++ b/src/library/os/windows/os-win.cpp
@@ -7,7 +7,7 @@
#include <licensecc/datatypes.h>
#include <iphlpapi.h>
#include <stdio.h>
-#pragma comment(lib, "IPHLPAPI.lib")
+//#pragma comment(lib, "IPHLPAPI.lib")
unsigned char* unbase64(const char* ascii, int len, int *flen);
@@ -64,8 +64,9 @@
if (diskInfos != NULL) {
if (ndrives < (int)*disk_info_size) {
diskInfos[ndrives].id = ndrives;
- strncpy(diskInfos[ndrives].device, volName, min(MAX_PATH,sizeof(volName))-1);
- strncpy(diskInfos[ndrives].label, fileSysName,min(sizeof(diskInfos[ndrives].label), sizeof(fileSysName)) - 1);
+ strncpy(diskInfos[ndrives].device, volName, cmin(MAX_PATH, sizeof(volName)) - 1);
+ strncpy(diskInfos[ndrives].label, fileSysName,
+ cmin(sizeof(diskInfos[ndrives].label), sizeof(fileSysName)) - 1);
memcpy(diskInfos[ndrives].disk_sn, &volSerial, sizeof(DWORD));
diskInfos[ndrives].preferred = (szSingleDrive[0] == 'C');
} else {
@@ -91,7 +92,7 @@
}
*disk_info_size = ndrives;
} else {
- *disk_info_size = min(ndrives, *disk_info_size);
+ *disk_info_size = cmin(ndrives, *disk_info_size);
}
return return_value;
}
@@ -105,5 +106,4 @@
}
return result;
}
-
--
Gitblit v1.9.1