change NK_MEMSET to memset(), because NK_MEMSET is NK internal
This commit is contained in:
parent
d829ff1ef1
commit
1e4eacca2e
@ -136,7 +136,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||
|
@ -262,7 +262,7 @@ nk_glfw3_render(struct nk_glfw* glfw, enum nk_anti_aliasing AA, int max_vertex_b
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||
|
@ -403,7 +403,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_glfw_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_glfw_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_glfw_vertex);
|
||||
|
@ -813,7 +813,7 @@ nk_sdlsurface_init(SDL_Surface *fb, float fontSize)
|
||||
if (!sdlsurface)
|
||||
return NULL;
|
||||
|
||||
NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context));
|
||||
memset(sdlsurface, 0, sizeof(struct sdlsurface_context));
|
||||
|
||||
sdlsurface->fb = fb;
|
||||
|
||||
@ -1001,7 +1001,7 @@ nk_sdlsurface_shutdown(struct sdlsurface_context *sdlsurface)
|
||||
if (sdlsurface) {
|
||||
SDL_FreeSurface(sdlsurface->font_tex);
|
||||
nk_free(&sdlsurface->ctx);
|
||||
NK_MEMSET(sdlsurface, 0, sizeof(struct sdlsurface_context));
|
||||
memset(sdlsurface, 0, sizeof(struct sdlsurface_context));
|
||||
free(sdlsurface);
|
||||
}
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ nk_sdl_render(enum nk_anti_aliasing AA)
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||
|
@ -243,7 +243,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||
|
@ -241,7 +241,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sdl_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_sdl_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sdl_vertex);
|
||||
|
@ -114,7 +114,7 @@ nk_sfml_render(enum nk_anti_aliasing AA)
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sfml_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
||||
|
@ -244,7 +244,7 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_sfml_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_sfml_vertex);
|
||||
|
@ -864,7 +864,7 @@ nk_xlib_shutdown(void)
|
||||
nk_xsurf_del(xlib.surf);
|
||||
nk_free(&xlib.ctx);
|
||||
XFreeCursor(xlib.dpy, xlib.cursor);
|
||||
NK_MEMSET(&xlib, 0, sizeof(xlib));
|
||||
memset(&xlib, 0, sizeof(xlib));
|
||||
}
|
||||
|
||||
NK_API void
|
||||
|
@ -146,7 +146,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_x11_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_x11_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
||||
|
@ -532,7 +532,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
|
||||
{NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_x11_vertex, col)},
|
||||
{NK_VERTEX_LAYOUT_END}
|
||||
};
|
||||
NK_MEMSET(&config, 0, sizeof(config));
|
||||
memset(&config, 0, sizeof(config));
|
||||
config.vertex_layout = vertex_layout;
|
||||
config.vertex_size = sizeof(struct nk_x11_vertex);
|
||||
config.vertex_alignment = NK_ALIGNOF(struct nk_x11_vertex);
|
||||
|
@ -821,7 +821,7 @@ nk_rawfb_init(void *fb, void *tex_mem, const unsigned int w, const unsigned int
|
||||
if (!rawfb)
|
||||
return NULL;
|
||||
|
||||
NK_MEMSET(rawfb, 0, sizeof(struct rawfb_context));
|
||||
memset(rawfb, 0, sizeof(struct rawfb_context));
|
||||
rawfb->font_tex.pixels = tex_mem;
|
||||
rawfb->font_tex.format = NK_FONT_ATLAS_ALPHA8;
|
||||
rawfb->font_tex.w = rawfb->font_tex.h = 0;
|
||||
@ -1015,7 +1015,7 @@ nk_rawfb_shutdown(struct rawfb_context *rawfb)
|
||||
{
|
||||
if (rawfb) {
|
||||
nk_free(&rawfb->ctx);
|
||||
NK_MEMSET(rawfb, 0, sizeof(struct rawfb_context));
|
||||
memset(rawfb, 0, sizeof(struct rawfb_context));
|
||||
free(rawfb);
|
||||
}
|
||||
}
|
||||
|
@ -287,7 +287,7 @@ nk_xlib_shutdown(void)
|
||||
XDestroyImage(xlib.ximg);
|
||||
shmdt(xlib.xsi.shmaddr);
|
||||
shmctl(xlib.xsi.shmid, IPC_RMID, NULL);
|
||||
} NK_MEMSET(&xlib, 0, sizeof(xlib));
|
||||
} memset(&xlib, 0, sizeof(xlib));
|
||||
}
|
||||
|
||||
NK_API void
|
||||
|
@ -942,7 +942,7 @@ nk_xlib_shutdown(void)
|
||||
nk_xsurf_del(xlib.surf);
|
||||
nk_free(&xlib.ctx);
|
||||
XFreeCursor(xlib.dpy, xlib.cursor);
|
||||
NK_MEMSET(&xlib, 0, sizeof(xlib));
|
||||
memset(&xlib, 0, sizeof(xlib));
|
||||
}
|
||||
|
||||
NK_API void
|
||||
|
Loading…
Reference in New Issue
Block a user