From 2240ba10f30315410bcff77e372ee71664ac4453 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 19 Feb 2010 08:12:31 -0700 Subject: mesa: replace old MEMSET macro with memset --- src/mesa/drivers/x11/xfonts.c | 2 +- src/mesa/drivers/x11/xm_dd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers/x11') diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c index f732c94586..91f819b8df 100644 --- a/src/mesa/drivers/x11/xfonts.c +++ b/src/mesa/drivers/x11/xfonts.c @@ -345,7 +345,7 @@ Fake_glXUseXFont(Font font, int first, int count, int listbase) glNewList(list, GL_COMPILE); if (valid && (bm_width > 0) && (bm_height > 0)) { - MEMSET(bm, '\0', bm_width * bm_height); + memset(bm, '\0', bm_width * bm_height); fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm); glBitmap(width, height, x0, y0, dx, dy, bm); diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index d70236c2a0..d304192f4c 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -232,7 +232,7 @@ clear_8bit_ximage( GLcontext *ctx, struct xmesa_renderbuffer *xrb, GLint i; for (i = 0; i < height; i++) { GLubyte *ptr = PIXEL_ADDR1(xrb, x, y + i); - MEMSET( ptr, xmesa->clearpixel, width ); + memset( ptr, xmesa->clearpixel, width ); } } @@ -294,7 +294,7 @@ clear_24bit_ximage(GLcontext *ctx, struct xmesa_renderbuffer *xrb, GLint j; for (j = 0; j < height; j++) { bgr_t *ptr3 = PIXEL_ADDR3(xrb, x, y + j); - MEMSET(ptr3, r, 3 * width); + memset(ptr3, r, 3 * width); } } else { @@ -524,7 +524,7 @@ xmesa_DrawPixels_8R8G8B( GLcontext *ctx, * been in the OpenGL bottom-to-top orientation. X is top-to-bottom * so we have to carefully compute the Y coordinates/addresses here. */ - MEMSET(&ximage, 0, sizeof(XMesaImage)); + memset(&ximage, 0, sizeof(XMesaImage)); ximage.width = width; ximage.height = height; ximage.format = ZPixmap; @@ -658,7 +658,7 @@ xmesa_DrawPixels_5R6G5B( GLcontext *ctx, * been in the OpenGL bottom-to-top orientation. X is top-to-bottom * so we have to carefully compute the Y coordinates/addresses here. */ - MEMSET(&ximage, 0, sizeof(XMesaImage)); + memset(&ximage, 0, sizeof(XMesaImage)); ximage.width = width; ximage.height = height; ximage.format = ZPixmap; @@ -829,7 +829,7 @@ clear_color_HPCR_ximage( GLcontext *ctx, const GLfloat color[4] ) if (color[0] == 0.0 && color[1] == 0.0 && color[2] == 0.0) { /* black is black */ - MEMSET( xmesa->xm_visual->hpcr_clear_ximage_pattern, 0x0 , + memset( xmesa->xm_visual->hpcr_clear_ximage_pattern, 0x0 , sizeof(xmesa->xm_visual->hpcr_clear_ximage_pattern)); } else { -- cgit v1.2.3