s/MEMCPY/_mesa_memcpy/ and fix typo

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 48c3612..1718145 100644 (file)
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -339,7 +339,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       if (overlapping) {
          /* get from buffered image */
          ASSERT(width < MAX_WIDTH);
-         MEMCPY(span.array->rgba, p, width * sizeof(GLchan) * 4);
+         _mesa_memcpy(span.array->rgba, p, width * sizeof(GLchan) * 4);
          p += width * 4;
       }
       else {
@@ -459,7 +459,7 @@ copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
       /* Get color indexes */
       if (overlapping) {
-         MEMCPY(span.array->index, p, width * sizeof(GLuint));
+         _mesa_memcpy(span.array->index, p, width * sizeof(GLuint));
          p += width;
       }
       else {
@@ -566,7 +566,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
       GLfloat depth[MAX_WIDTH];
       /* get depth values */
       if (overlapping) {
-         MEMCPY(depth, p, width * sizeof(GLfloat));
+         _mesa_memcpy(depth, p, width * sizeof(GLfloat));
          p += width;
       }
       else {
@@ -669,7 +669,7 @@ copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
       /* Get stencil values */
       if (overlapping) {
-         MEMCPY(stencil, p, width * sizeof(GLstencil));
+         _mesa_memcpy(stencil, p, width * sizeof(GLstencil));
          p += width;
       }
       else {
@@ -700,7 +700,7 @@ copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
 
 /**
- * This isn't terribly efficient.  If a drivef really has combined
+ * This isn't terribly efficient.  If a driver really has combined
  * depth/stencil buffers the driver should implement an optimized
  * CopyPixels function.
  */