mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-14 06:42:58 +08:00
Merge 211a895008e636faa784d4539c1836dd40e98ed5 into dev
This commit is contained in:
commit
2e00a075d8
@ -8,8 +8,8 @@ LVGL_DIR_NAME ?= lvgl
|
||||
WARNINGS = -Werror -Wall -Wextra \
|
||||
-Wshadow -Wundef -Wmaybe-uninitialized -Wmissing-prototypes -Wpointer-arith -Wuninitialized \
|
||||
-Wunreachable-code -Wreturn-type -Wmultichar -Wformat-security -Wdouble-promotion -Wclobbered -Wdeprecated \
|
||||
-Wempty-body -Wshift-negative-value -Wstack-usage=2048 \
|
||||
-Wtype-limits -Wsizeof-pointer-memaccess
|
||||
-Wempty-body -Wshift-negative-value -Wstack-usage=2048 -pedantic-errors \
|
||||
-Wtype-limits -Wsizeof-pointer-memaccess -Wpedantic -Wmissing-prototypes -Wno-discarded-qualifiers
|
||||
|
||||
#-Wno-unused-value -Wno-unused-parameter
|
||||
OPTIMIZATION ?= -O3 -g0
|
||||
|
@ -16,6 +16,9 @@
|
||||
|
||||
#include "lv_test_font_loader.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wpedantic"
|
||||
|
||||
/*********************
|
||||
* DEFINES
|
||||
*********************/
|
||||
@ -212,6 +215,7 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2)
|
||||
}
|
||||
#endif
|
||||
|
||||
#pragma GCC diagnostic pop
|
||||
/**********************
|
||||
* STATIC FUNCTIONS
|
||||
**********************/
|
||||
|
Loading…
x
Reference in New Issue
Block a user