vurtun
/
nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #886 from Hejsil/use-memset-macros-in-x11-demoes 

use NK_MEMSET instead of nk_memset in X11 demos
master
dumblob 2019-08-19 23:10:45 +02:00 committed by GitHub
parent 8cd276714c f176f3d7e6
commit 5d81d324c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/x11/nuklear_xlib.h
View File

@ -863,7 +863,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));
NK_MEMSET(&xlib, 0, sizeof(xlib));
}
NK_API void

4
demo/x11_rawfb/nuklear_rawfb.h
View File

@ -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));
NK_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));
NK_MEMSET(rawfb, 0, sizeof(struct rawfb_context));
free(rawfb);
}
}

2
demo/x11_rawfb/nuklear_xlib.h
View File

@ -286,7 +286,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));
} NK_MEMSET(&xlib, 0, sizeof(xlib));
}
NK_API void

2
demo/x11_xft/nuklear_xlib.h
View File

@ -941,7 +941,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));
NK_MEMSET(&xlib, 0, sizeof(xlib));
}
NK_API void