Description: Fix compilation warning of 730release

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5MRU3
Feature or Bugfix: Bugfix
Binary Source: No
Signed-off-by: suwenxiang <suwenxiang@huawei.com>
This commit is contained in:
suwenxiang
2022-08-17 17:17:45 +08:00
parent 54ff607a6b
commit fa41f554a6
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -27,7 +27,7 @@
namespace { namespace {
#ifdef _WIN32 #ifdef _WIN32
constexpr int32_t HUNDRED_NS_PER_MS = 10000; constexpr int32_t HUNDRED_NS_PER_MS = 10000;
#elif defined(_LITEOS_M__) #elif defined(__LITEOS_M__)
#else #else
constexpr int16_t MS_PER_SECOND = 1000; constexpr int16_t MS_PER_SECOND = 1000;
constexpr int32_t NS_PER_MS = 1000000; 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) static void TimerCallback(void* args)
{ {
GraphicTimer* timer = reinterpret_cast<GraphicTimer*>(args); GraphicTimer* timer = reinterpret_cast<GraphicTimer*>(args);
+3 -3
View File
@@ -18,7 +18,7 @@
#include <cstdint> #include <cstdint>
#ifdef _WIN32 #ifdef _WIN32
#elif defined(_LITEOS_M__) #elif defined(__LITEOS_M__)
#include "cmsis_os2.h" #include "cmsis_os2.h"
#else #else
#include <ctime> #include <ctime>
@@ -41,7 +41,7 @@ public:
#ifdef _WIN32 #ifdef _WIN32
void* GetNativeTimer() void* GetNativeTimer()
#elif defined(_LITEOS_M__) #elif defined(__LITEOS_M__)
osTimerId_t GetNativeTimer() osTimerId_t GetNativeTimer()
#else #else
timer_t GetNativeTimer() timer_t GetNativeTimer()
@@ -73,7 +73,7 @@ private:
#ifdef _WIN32 #ifdef _WIN32
void* timer_ = nullptr; void* timer_ = nullptr;
#elif defined(_LITEOS_M__) #elif defined(__LITEOS_M__)
osTimerId_t timer_; osTimerId_t timer_;
#else #else
timer_t timer_; timer_t timer_;
+1 -1
View File
@@ -18,7 +18,7 @@
#include "graphic_config.h" #include "graphic_config.h"
#if ENABLE_GRAPHIC_LOG #if ENABLE_GRAPHIC_LOG
#if defined(__LITEOS__) || defined(_LITEOS_M__) || defined(__linux__) #if defined(__LITEOS__) || defined(__LITEOS_M__) || defined(__linux__)
#include "log.h" #include "log.h"
#include <cstring> #include <cstring>
#else #else