openharmony/graphic_utils
1
0
Fork 0
mirror of https://github.com/openharmony/graphic_utils.git synced 2026-07-20 19:45:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

!179 修复730release的编译告警

Browse Source 
Merge pull request !179 from suwenxiang/OpenHarmony-3.2-Beta2
This commit is contained in:
openharmony_ci
2022-08-19 02:50:17 +00:00
committed by Gitee
parent 54ff607a6b fa41f554a6
commit 98791a62f2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/graphic_timer.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
namespace {
#ifdef _WIN32
constexpr int32_t HUNDRED_NS_PER_MS = 10000;
#elif defined(_LITEOS_M__)
#elif defined(__LITEOS_M__)
#else
constexpr int16_t MS_PER_SECOND = 1000;
constexpr int32_t NS_PER_MS = 1000000;
@@ -134,7 +134,7 @@ void GraphicTimer::Stop()
}
}
#elif defined(_LITEOS_M__)
#elif defined(__LITEOS_M__)
static void TimerCallback(void* args)
{
GraphicTimer* timer = reinterpret_cast<GraphicTimer*>(args);
interfaces/innerkits/graphic_timer.h
+3 -3
View File
@@ -18,7 +18,7 @@
#include <cstdint>
#ifdef _WIN32
#elif defined(_LITEOS_M__)
#elif defined(__LITEOS_M__)
#include "cmsis_os2.h"
#else
#include <ctime>
@@ -41,7 +41,7 @@ public:
#ifdef _WIN32
void* GetNativeTimer()
#elif defined(_LITEOS_M__)
#elif defined(__LITEOS_M__)
osTimerId_t GetNativeTimer()
#else
timer_t GetNativeTimer()
@@ -73,7 +73,7 @@ private:
#ifdef _WIN32
void* timer_ = nullptr;
#elif defined(_LITEOS_M__)
#elif defined(__LITEOS_M__)
osTimerId_t timer_;
#else
timer_t timer_;
interfaces/kits/gfx_utils/graphic_log.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include "graphic_config.h"
#if ENABLE_GRAPHIC_LOG
#if defined(__LITEOS__) || defined(_LITEOS_M__) || defined(__linux__)
#if defined(__LITEOS__) || defined(__LITEOS_M__) || defined(__linux__)
#include "log.h"
#include <cstring>
#else