From a0b74b09a5824d50613e3b3a5590e7a9ed515716 Mon Sep 17 00:00:00 2001
From: Wenfeng CAI <xoxyzox-m@yahoo.com>
Date: 周二, 13 11月 2018 10:51:36 +0800
Subject: [PATCH] Fix assumed return type of MSVC
---
src/library/os/os.h | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/library/os/os.h b/src/library/os/os.h
index d61e226..bd19f9d 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -2,7 +2,7 @@
* os-dependent.hpp
*
* Created on: Mar 29, 2014
- * Author: devel
+ *
*/
#ifndef OS_DEPENDENT_HPP_
@@ -14,18 +14,27 @@
#include "../base/base.h"
#include <stddef.h>
+//definition of size_t
+#include <stdlib.h>
+#ifdef __unix__
#include <stdbool.h>
+#endif
typedef enum {
NONE, VMWARE
} VIRTUALIZATION;
+typedef enum {
+ IFACE_TYPE_ETHERNET, IFACE_TYPE_WIRELESS
+} IFACE_TYPE;
+
typedef struct {
int id;
char description[1024];
- unsigned char mac_address[6];
+ unsigned char mac_address[8];
unsigned char ipv4_address[4];
-} AdapterInfo;
+ IFACE_TYPE type;
+} OsAdapterInfo;
typedef struct {
int id;
@@ -35,10 +44,11 @@
bool preferred;
} DiskInfo;
-FUNCTION_RETURN getAdapterInfos(AdapterInfo * adapterInfos,
+FUNCTION_RETURN getAdapterInfos(OsAdapterInfo * adapterInfos,
size_t * adapter_info_size);
FUNCTION_RETURN getDiskInfos(DiskInfo * diskInfos, size_t * disk_info_size);
FUNCTION_RETURN getUserHomePath(char[MAX_PATH]);
+FUNCTION_RETURN getModuleName(char buffer[MAX_PATH]);
FUNCTION_RETURN getCpuId(unsigned char identifier[6]);
FUNCTION_RETURN getMachineName(unsigned char identifier[6]);
/**
@@ -63,6 +73,8 @@
VIRTUALIZATION getVirtualization();
void os_initialize();
+FUNCTION_RETURN verifySignature(const char* stringToVerify, const char* signatureB64);
+
#ifdef __cplusplus
}
#endif
--
Gitblit v1.9.1