From 91c7a8cffe77088da5e2546da3c002546e362d68 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Wed, 16 Aug 2023 15:40:11 -0700 Subject: [PATCH] Misc Fixes - Code protection fixes for v18 - Fix MSVC error with static_assert - Fix RSA with Cobalt - Workaround SCP errors with string concatenation - Use snprintf instead Merged from https://widevine-internal-review.googlesource.com/183190 Change-Id: If2e9ee3403e313fd8c7dffccca6f8d3f7b0b0afb --- libwvdrmengine/oemcrypto/include/level3_file_system.h | 1 + libwvdrmengine/oemcrypto/odk/src/odk_assert.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/oemcrypto/include/level3_file_system.h b/libwvdrmengine/oemcrypto/include/level3_file_system.h index 232fbf8e..8f8fbc39 100644 --- a/libwvdrmengine/oemcrypto/include/level3_file_system.h +++ b/libwvdrmengine/oemcrypto/include/level3_file_system.h @@ -12,6 +12,7 @@ #define LEVEL3_FILE_SYSTEM_H_ #include +#include "platform.h" namespace wvoec3 { diff --git a/libwvdrmengine/oemcrypto/odk/src/odk_assert.h b/libwvdrmengine/oemcrypto/odk/src/odk_assert.h index 0517818b..e0de19df 100644 --- a/libwvdrmengine/oemcrypto/odk/src/odk_assert.h +++ b/libwvdrmengine/oemcrypto/odk/src/odk_assert.h @@ -9,7 +9,7 @@ extern "C" { #endif -#if (__STDC_VERSION__ >= 201112L) +#if defined(_MSC_VER) || (__STDC_VERSION__ >= 201112L) #include #define odk_static_assert static_assert #else