summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2008-01-23 15:47:10 +0100
committerJosé Fonseca <[email protected]>2008-01-26 11:05:42 +0900
commit9387784fbf22495898abe3dc41cfcd42397792cd (patch)
treec3fbc5172f200f6e143d5dde9bc1151aaeef9217 /src/mesa
parent0fe428f1dfafe6bfb8896e0a08cbe12d569497d7 (diff)
gallium: Fix build on Windows.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/pipe/pipebuffer/pb_buffer_client.c1
-rw-r--r--src/mesa/pipe/pipebuffer/pb_buffer_malloc.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_client.c b/src/mesa/pipe/pipebuffer/pb_buffer_client.c
index 477ecfe32cf..c316aabd32e 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer_client.c
+++ b/src/mesa/pipe/pipebuffer/pb_buffer_client.c
@@ -36,7 +36,6 @@
#include "pipe/p_util.h"
#include "pb_buffer.h"
-#include "pipe/p_util.h"
struct pb_user_buffer
diff --git a/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c b/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c
index 42aae7acfa2..b80ee8dda36 100644
--- a/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c
+++ b/src/mesa/pipe/pipebuffer/pb_buffer_malloc.c
@@ -37,6 +37,7 @@
#include <assert.h>
#include <stdlib.h>
+#include "pipe/p_util.h"
#include "pb_buffer.h"
@@ -61,7 +62,7 @@ malloc_buffer(struct pb_buffer *buf)
static void
malloc_buffer_destroy(struct pb_buffer *buf)
{
- free(malloc_buffer(buf)->data);
+ FREE(malloc_buffer(buf)->data);
FREE(buf);
}
@@ -119,7 +120,7 @@ pb_malloc_buffer_create( unsigned alignment,
buf->base.base.usage = usage;
buf->base.base.size = size;
- buf->data = malloc(size);
+ buf->data = MALLOC(size);
if(!buf->data) {
FREE(buf);
return NULL;