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

Merge branch 'Immediate-Mode-UI:master' into inline_instruct

This commit is contained in:
PROP 65 2024-09-05 05:46:59 +00:00 committed by GitHub
parent 10aaef725d ec113a0f7c
commit 8e0308b275
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/common/overview.c
View File

@ -1,3 +1,5 @@
#include <time.h>
static int static int
overview(struct nk_context *ctx) overview(struct nk_context *ctx)
{ {

6
src/nuklear.h
View File

@ -3628,11 +3628,11 @@ NK_API struct nk_vec2 nk_rect_size(struct nk_rect);
NK_API int nk_strlen(const char *str); NK_API int nk_strlen(const char *str);
NK_API int nk_stricmp(const char *s1, const char *s2); NK_API int nk_stricmp(const char *s1, const char *s2);
NK_API int nk_stricmpn(const char *s1, const char *s2, int n); NK_API int nk_stricmpn(const char *s1, const char *s2, int n);
NK_API int nk_strtoi(const char *str, const char **endptr); NK_API int nk_strtoi(const char *str, char **endptr);
NK_API float nk_strtof(const char *str, const char **endptr); NK_API float nk_strtof(const char *str, char **endptr);
#ifndef NK_STRTOD #ifndef NK_STRTOD
#define NK_STRTOD nk_strtod #define NK_STRTOD nk_strtod
NK_API double nk_strtod(const char *str, const char **endptr); NK_API double nk_strtod(const char *str, char **endptr);
#endif #endif
NK_API int nk_strfilter(const char *text, const char *regexp); NK_API int nk_strfilter(const char *text, const char *regexp);
NK_API int nk_strmatch_fuzzy_string(char const *str, char const *pattern, int *out_score); NK_API int nk_strmatch_fuzzy_string(char const *str, char const *pattern, int *out_score);

6
src/nuklear_util.c
View File

@ -141,7 +141,7 @@ nk_strlen(const char *str)
return siz; return siz;
} }
NK_API int NK_API int
nk_strtoi(const char *str, const char **endptr) nk_strtoi(const char *str, char **endptr)
{ {
int neg = 1; int neg = 1;
const char *p = str; const char *p = str;
@ -165,7 +165,7 @@ nk_strtoi(const char *str, const char **endptr)
return neg*value; return neg*value;
} }
NK_API double NK_API double
nk_strtod(const char *str, const char **endptr) nk_strtod(const char *str, char **endptr)
{ {
double m; double m;
double neg = 1.0; double neg = 1.0;
@ -222,7 +222,7 @@ nk_strtod(const char *str, const char **endptr)
return number; return number;
} }
NK_API float NK_API float
nk_strtof(const char *str, const char **endptr) nk_strtof(const char *str, char **endptr)
{ {
float float_value; float float_value;
double double_value; double double_value;