Merge pull request #330 from DeXP/master

Remove warning: 'nk_to_upper' defined but not used
This commit is contained in:
Micha Mettke 2017-01-24 22:28:13 +01:00 committed by GitHub
commit 3123ba0167
2 changed files with 3 additions and 3 deletions

View File

@ -10,8 +10,8 @@
*
* ===============================================================
*/
#ifndef NK_XLIB_GL3_H_
#define NK_XLIB_GL3_H_
#ifndef NK_XLIB_GL2_H_
#define NK_XLIB_GL2_H_
#include <X11/Xlib.h>
NK_API struct nk_context* nk_x11_init(Display *dpy, Window win);

View File

@ -3740,7 +3740,7 @@ nk_strmatch_fuzzy_text(const char *str, int str_len,
int next_match = *pattern_iter != '\0' &&
nk_to_lower(pattern_letter) == nk_to_lower(str_letter);
int rematch = best_letter && nk_to_lower(*best_letter) == nk_to_lower(str_letter);
int rematch = best_letter && nk_to_upper(*best_letter) == nk_to_upper(str_letter);
int advanced = next_match && best_letter;
int pattern_repeat = best_letter && *pattern_iter != '\0';