4 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
index 61a757c870d..f42a046c00d 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
@@ -1173,7 +1173,7 @@ static void free_funcs( struct dynfn *l )
    foreach_s (f, tmp, l) {
       remove_from_list( f );
       _mesa_exec_free( f->code );
-      FREE( f );
+      _mesa_free( f );
    }
 }
 
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
index 32a21c48977..46999191e04 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
@@ -57,10 +57,10 @@ do {							\
    char *start = (char *)&FUNC;				\
    char *end = (char *)&FUNC##_end;			\
    insert_at_head( &CACHE, dfn );			\
-   dfn->key[0] = key[0];					\
-   dfn->key[1] = key[1];					\
-   dfn->code = _mesa_exec_malloc( end - start );		\
-   memcpy (dfn->code, start, end - start);		\
+   dfn->key[0] = key[0];				\
+   dfn->key[1] = key[1];				\
+   dfn->code = _mesa_exec_malloc( end - start );	\
+   _mesa_memcpy(dfn->code, start, end - start);		\
 }							\
 while ( 0 )
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
index 537a1c03520..3b3f459dffb 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
@@ -1039,7 +1039,7 @@ static void free_funcs( struct dynfn *l )
    foreach_s (f, tmp, l) {
       remove_from_list( f );
       _mesa_exec_free( f->code );
-      FREE( f );
+      _mesa_free( f );
    }
 }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
index a7d5b8334df..a656e49e445 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
@@ -56,8 +56,8 @@ do {							\
    char *end = (char *)&FUNC##_end;			\
    insert_at_head( &CACHE, dfn );			\
    dfn->key = key;					\
-   dfn->code = _mesa_exec_malloc( end - start );		\
-   memcpy (dfn->code, start, end - start);		\
+   dfn->code = _mesa_exec_malloc( end - start );	\
+   _mesa_memcpy(dfn->code, start, end - start);		\
 }							\
 while ( 0 )