From 84597288d950867922a185b2c5a8231495a5d303 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 11 1月 2020 15:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers
---
src/library/pc_identifier/pc-identifiers.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/library/pc_identifier/pc-identifiers.h b/src/library/pc_identifier/pc-identifiers.h
index 2eb0d56..4c4c86f 100644
--- a/src/library/pc_identifier/pc-identifiers.h
+++ b/src/library/pc_identifier/pc-identifiers.h
@@ -9,14 +9,14 @@
#define PC_IDENTIFIERS_H_
#include <licensecc/datatypes.h>
-#include "base/base.h"
#ifdef __cplusplus
extern "C" {
#endif
+#include "../base/base.h"
typedef unsigned char PcIdentifier[6];
-typedef char PcSignature[PC_IDENTIFIER_SIZE + 1];
+typedef char PcSignature[API_PC_IDENTIFIER_SIZE + 1];
FUNCTION_RETURN generate_pc_id(PcIdentifier * identifiers, unsigned int * array_size,
IDENTIFICATION_STRATEGY strategy);
--
Gitblit v1.9.1