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

This commit is contained in:
PROP 65 2024-09-05 05:47:11 +00:00 committed by GitHub
commit 3ad2c38955
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions

View File

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

View File

@ -3612,11 +3612,11 @@ NK_API struct nk_vec2 nk_rect_size(struct nk_rect);
NK_API int nk_strlen(const char *str);
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_strtoi(const char *str, const char **endptr);
NK_API float nk_strtof(const char *str, const char **endptr);
NK_API int nk_strtoi(const char *str, char **endptr);
NK_API float nk_strtof(const char *str, char **endptr);
#ifndef 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
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);

View File

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