From 4e1f76fae58a7e0db111ec68e616e6ea3222f726 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 13 10月 2019 16:17:06 +0800
Subject: [PATCH] fix windows tests

---
 src/library/license++.cpp |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/library/license++.cpp b/src/library/license++.cpp
index 8f913b0..3e4ae40 100644
--- a/src/library/license++.cpp
+++ b/src/library/license++.cpp
@@ -9,21 +9,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
+
 #include "api/license++.h"
-#include "LicenseReader.h"
+
+#include "LicenseReader.hpp"
 
 using namespace std;
-DllExport void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {
+void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {
 
 }
 
-DllExport void identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char chbuffer[PC_IDENTIFIER_SIZE + 1]) {
+void identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char chbuffer[PC_IDENTIFIER_SIZE + 1]) {
 
 }
 
 static void mergeLicenses(vector<license::FullLicenseInfo> licenses,
 		LicenseInfo* license) {
-	if (license != NULL) {
+	if (license != nullptr) {
 		time_t curLicense_exp = 0;
 		for (auto it = licenses.begin(); it != licenses.end(); it++) {
 			//choose the license that expires later...
@@ -68,18 +70,18 @@
 	} else {
 		result = er.getLastFailure()->event_type;
 	}
-	if (license != NULL) {
+	if (license != nullptr) {
 		er.exportLastEvents(license->status, 5);
 	}
 	return result;
 }
 
-DllExport EVENT_TYPE confirm_license(char * product,
+EVENT_TYPE confirm_license(char * product,
 		LicenseLocation licenseLocation) {
 	return LICENSE_OK;
 }
 
-DllExport EVENT_TYPE release_license(char * product,
+EVENT_TYPE release_license(char * product,
 		LicenseLocation licenseLocation) {
 	return LICENSE_OK;
 }

--
Gitblit v1.9.1