From 6c3e09a571f407d2bd691c8e5cd1cc43b7e4d022 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 22:01:05 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop
---
src/library/os/os.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/library/os/os.h b/src/library/os/os.h
index 9fda7c7..fa1862f 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -12,7 +12,6 @@
extern "C" {
#endif
-#include "../base/base.h"
#include <stddef.h>
#include <string.h>
#include <ctype.h>
@@ -23,13 +22,14 @@
#include <unistd.h>
#include <stdbool.h>
#endif
+#include "../base/base.h"
typedef struct {
int id;
- char device[255];
+ char device[MAX_PATH];
unsigned char disk_sn[8];
char label[255];
- bool preferred;
+ int preferred;
} DiskInfo;
FUNCTION_RETURN getDiskInfos(DiskInfo* diskInfos, size_t* disk_info_size);
--
Gitblit v1.9.1