mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from riskpeep/issue-231-iso-ansi-pedantic-compilation-error 

Fix C89 compilation errors
This commit is contained in:
Komari Spaghetti 2020-12-24 15:46:43 +01:00 committed by GitHub
parent ed45455c5d fc5dc44d8e
commit daecaaa5af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nuklear.h
View File

@ -6053,9 +6053,9 @@ nk_stbtt_free(void *ptr, void *user_data) {
#define STBTT_malloc(x,u) nk_stbtt_malloc(x,u)
#define STBTT_free(x,u) nk_stbtt_free(x,u)
#endif // STBTT_malloc
#endif /* STBTT_malloc */
#endif // NK_INCLUDE_FONT_BAKING
#endif /* NK_INCLUDE_FONT_BAKING */
#endif
@ -16432,8 +16432,8 @@ nk_font_bake_pack(struct nk_font_baker *baker,
}
/* setup font baker from temporary memory */
for (config_iter = config_list; config_iter; config_iter = config_iter->next) {
it = config_iter;
struct stbtt_fontinfo *font_info = &baker->build[i++].info;
it = config_iter;
font_info->userdata = alloc;
do {if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0))
return nk_false;

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "nuklear",
"version": "4.06.1",
"version": "4.06.2",
"repo": "Immediate-Mode-UI/Nuklear",
"description": "A small ANSI C gui toolkit",
"keywords": ["gl", "ui", "toolkit"],

1
src/CHANGELOG
View File

@ -8,6 +8,7 @@
/// - [yy]: Minor version with non-breaking API and library changes
/// - [zz]: Bug fix version with no direct changes to API
///
/// - 2020/12/19 (4.06.2) - Fix additional C++ style comments which are not allowed in ISO C90.
/// - 2020/10/11 (4.06.1) - Fix C++ style comments which are not allowed in ISO C90.
/// - 2020/10/07 (4.06.0) - Fix nk_combo return type wrongly changed to nk_bool
/// - 2020/09/05 (4.05.0) - Use the nk_font_atlas allocator for stb_truetype memory management.

2
src/nuklear_font.c
View File

@ -189,8 +189,8 @@ nk_font_bake_pack(struct nk_font_baker *baker,
}
/* setup font baker from temporary memory */
for (config_iter = config_list; config_iter; config_iter = config_iter->next) {
it = config_iter;
struct stbtt_fontinfo *font_info = &baker->build[i++].info;
it = config_iter;
font_info->userdata = alloc;
do {if (!stbtt_InitFont(font_info, (const unsigned char*)it->ttf_blob, 0))
return nk_false;

4
src/nuklear_internal.h
View File

@ -346,9 +346,9 @@ nk_stbtt_free(void *ptr, void *user_data) {
#define STBTT_malloc(x,u) nk_stbtt_malloc(x,u)
#define STBTT_free(x,u) nk_stbtt_free(x,u)
#endif // STBTT_malloc
#endif /* STBTT_malloc */
#endif // NK_INCLUDE_FONT_BAKING
#endif /* NK_INCLUDE_FONT_BAKING */
#endif