Merge remote-tracking branch 'opcm-github/master'

Change-Id: I2e049be272ac0d51d972af2c925ccf2b9ae678b1

Author: rdementi

appveyor.yml

@@ -15,7 +15,7 @@ build_script:
 - cmake --build build --config Release --parallel
 
 after_build:
-- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp
+- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp %APPVEYOR_BUILD_FOLDER%\src\windows\PCM-Service.exe.config
 artifacts:
 - path: pcm-all.zip
-  name: pcm-all
+  name: pcm-all

src/types.h

@@ -303,7 +303,9 @@ constexpr auto IA32_PQR_ASSOC = 0xc8f;
 constexpr auto IA32_QM_EVTSEL = 0xc8d;
 constexpr auto IA32_QM_CTR = 0xc8e;
 
+#ifndef KERNEL
 constexpr auto PCM_INVALID_QOS_MONITORING_DATA = (std::numeric_limits<uint64>::max)();
+#endif
 
 /* \brief Event Select Register format
 
@@ -1445,7 +1447,9 @@ struct ICX_IIOPMUCNTCTLRegister
 
 constexpr auto MSR_PACKAGE_THERM_STATUS = 0x01B1;
 constexpr auto MSR_IA32_THERM_STATUS = 0x019C;
+#ifndef KERNEL
 constexpr auto PCM_INVALID_THERMAL_HEADROOM = (std::numeric_limits<int32_t>::min)();
+#endif
 
 constexpr auto MSR_IA32_BIOS_SIGN_ID = 0x8B;
 

src/utils.h

@@ -27,6 +27,7 @@
 #endif
 
 #ifndef _MSC_VER
+#include <unistd.h>
 #include <csignal>
 #include <ctime>
 #include <cmath>
@@ -39,7 +40,6 @@
 #ifdef __linux__
 #include <unistd.h>
 #endif
-
 namespace pcm {
     std::string safe_getenv(const char* env);
 }