test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 20:18:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix utils

Browse Source
This commit is contained in:
xianjimli 2018-09-22 17:55:50 +08:00
parent 1890c82b9a
commit 95892e56e4
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/types_def.h
View File

@ -26,6 +26,7 @@
#include <ctype.h>
#include <wchar.h>
#include <assert.h>
#include <stdarg.h>
#include <stdint.h>
#if defined(HAS_AWTK_CONFIG)
@ -148,6 +149,7 @@ typedef enum _lcd_orientation_t {
#define log_info(format, ...) printf(format, __VA_ARGS__)
#define log_warn(format, ...) printf(format, __VA_ARGS__)
#define log_error(format, ...) printf(format, __VA_ARGS__)
#define snprintf _snprintf
#elif defined(HAS_STDIO)
#define log_debug(format, args...) printf(format, ##args)
#define log_info(format, args...) printf(format, ##args)

29
src/base/utils.c Normal file → Executable file
View File

@ -334,15 +334,12 @@ void* tk_pixel_copy(void* dst, const void* src, uint32_t size, uint8_t bpp) {
return dst;
}
#if defined(LINUX) || defined(APPLE) || defined(HAS_STDIO)
#if defined(LINUX) || defined(APPLE) || defined(HAS_STDIO) || defined(WINDOWS)
#include <stdio.h>
#include <stdarg.h>
#if defined(WINDOWS)
#include <windows.h>
#define vsnprintf _vsnprintf
#endif /*defined(WINDOWS)*/
#else
extern int vsscanf(const char* s, const char* format, va_list arg);
extern int vsnprintf(char* str, size_t size, const char* format, va_list ap);
#endif/*LINUX || APPLE || HAS_STDIO || WINDOWS*/
int tk_snprintf(char* str, size_t size, const char* format, ...) {
int ret = 0;
@ -353,22 +350,6 @@ int tk_snprintf(char* str, size_t size, const char* format, ...) {
return ret;
}
#else
#define STB_SPRINTF_STATIC 1
#define STB_SPRINTF_IMPLEMENTATION 1
#include "stb/stb_sprintf.h"
int tk_snprintf(char* str, size_t size, const char* format, ...) {
int ret = 0;
va_list va;
va_start(va, format);
ret = stbsp_vsnprintf(str, size, format, va);
va_end(va);
return ret;
}
#endif /*defined(LINUX) || defined(WINDOWS) || defined(APPLE) || defined(HAS_STDIO)*/
extern int vsscanf(const char* s, const char* format, va_list arg);
int tk_sscanf(const char* str, const char* format, ...) {
int ret = 0;