5 files changed, 16 insertions, 16 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 040382698b1..b91303d3e7b 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -159,7 +159,7 @@ dri_create_context(gl_api api, const struct gl_config * visual,
    if (ctx && ctx->st)
       ctx->st->destroy(ctx->st);
 
-   FREE(ctx);
+   free(ctx);
    return GL_FALSE;
 }
 
@@ -172,7 +172,7 @@ dri_destroy_context(__DRIcontext * cPriv)
     * driParseConfigFiles allocated values only - the rest
     * is owned by screen optionCache.
     */
-   FREE(ctx->optionCache.values);
+   free(ctx->optionCache.values);
 
    /* No particular reason to wait for command completion before
     * destroying a context, but we flush the context here
@@ -184,7 +184,7 @@ dri_destroy_context(__DRIcontext * cPriv)
 
    if (ctx->pp) pp_free(ctx->pp);
 
-   FREE(ctx);
+   free(ctx);
 }
 
 GLboolean
diff --git a/src/gallium/state_trackers/dri/common/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c
index 102a1326133..b76cb9a9ee1 100644
--- a/src/gallium/state_trackers/dri/common/dri_screen.c
+++ b/src/gallium/state_trackers/dri/common/dri_screen.c
@@ -355,13 +355,13 @@ dri_destroy_option_cache(struct dri_screen * screen)
 
    if (screen->optionCache.info) {
       for (i = 0; i < (1 << screen->optionCache.tableSize); ++i) {
-         FREE(screen->optionCache.info[i].name);
-         FREE(screen->optionCache.info[i].ranges);
+         free(screen->optionCache.info[i].name);
+         free(screen->optionCache.info[i].ranges);
       }
-      FREE(screen->optionCache.info);
+      free(screen->optionCache.info);
    }
 
-   FREE(screen->optionCache.values);
+   free(screen->optionCache.values);
 }
 
 void
@@ -383,7 +383,7 @@ dri_destroy_screen(__DRIscreen * sPriv)
 
    dri_destroy_screen_helper(screen);
 
-   FREE(screen);
+   free(screen);
    sPriv->driverPrivate = NULL;
    sPriv->extensions = NULL;
 }
diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index 5dac7a7dccd..f27c35c73c4 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -357,7 +357,7 @@ glXUseXFont(Font font, int first, int count, int listbase)
       glEndList();
    }
 
-   FREE(bm);
+   free(bm);
    XFreeFontInfo(NULL, fs, 1);
    XFreeGC(dpy, gc);
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index ef275b2e41c..37613304bb8 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -169,7 +169,7 @@ xmesa_init_display( Display *display )
             xmdpy->screen = NULL;
          }
          if (xmdpy->smapi) {
-            FREE(xmdpy->smapi);
+            free(xmdpy->smapi);
             xmdpy->smapi = NULL;
          }
 
@@ -800,8 +800,8 @@ XMesaVisual XMesaCreateVisual( Display *display,
 
    v->stvis.color_format = choose_pixel_format(v);
    if (v->stvis.color_format == PIPE_FORMAT_NONE) {
-      FREE(v->visinfo);
-      FREE(v);
+      free(v->visinfo);
+      free(v);
       return NULL;
    }
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.c b/src/gallium/state_trackers/glx/xlib/xm_st.c
index f6439dc831b..ee425ec2b59 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_st.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_st.c
@@ -279,9 +279,9 @@ xmesa_create_st_framebuffer(XMesaDisplay xmdpy, XMesaBuffer b)
    xstfb = CALLOC_STRUCT(xmesa_st_framebuffer);
    if (!stfbi || !xstfb) {
       if (stfbi)
-         FREE(stfbi);
+         free(stfbi);
       if (xstfb)
-         FREE(xstfb);
+         free(xstfb);
       return NULL;
    }
 
@@ -314,8 +314,8 @@ xmesa_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi)
    for (i = 0; i < ST_ATTACHMENT_COUNT; i++)
       pipe_resource_reference(&xstfb->textures[i], NULL);
 
-   FREE(xstfb);
-   FREE(stfbi);
+   free(xstfb);
+   free(stfbi);
 }
 
 void