diff options
| author | Younes Manton <[email protected]> | 2008-12-20 17:09:55 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2009-01-10 13:52:07 -0500 |
| commit | 1e9c3efcc783cee46268cc227234ed118f0cc08b (patch) | |
| tree | ffbd201fa2eae04348797d74e2124f739858fe3d /src/libXvMC | |
| parent | db1021a37c29a60c70ce294077680ca3e98a6460 (diff) | |
g3dvl: Use Gallium MALLOC wrappers.
Diffstat (limited to 'src/libXvMC')
| -rw-r--r-- | src/libXvMC/Makefile | 2 | ||||
| -rw-r--r-- | src/libXvMC/block.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libXvMC/Makefile b/src/libXvMC/Makefile index 4de26e96202..7badcfd2645 100644 --- a/src/libXvMC/Makefile +++ b/src/libXvMC/Makefile @@ -8,7 +8,7 @@ ifeq (${DRIVER}, softpipe) OBJECTS += ${GALLIUMDIR}/winsys/g3dvl/xsp_winsys.o endif -CFLAGS += -g -fPIC -Wall \ +CFLAGS += -g -fPIC -Wall -Werror=implicit-function-declaration \ -I${GALLIUMDIR}/state_trackers/g3dvl \ -I${GALLIUMDIR}/winsys/g3dvl \ -I${GALLIUMDIR}/include \ diff --git a/src/libXvMC/block.c b/src/libXvMC/block.c index 328b035576b..b38a89be092 100644 --- a/src/libXvMC/block.c +++ b/src/libXvMC/block.c @@ -1,7 +1,7 @@ #include <assert.h> -#include <stdlib.h> #include <X11/Xlib.h> #include <X11/extensions/XvMC.h> +#include <util/u_memory.h> #include <vl_display.h> #include <vl_screen.h> #include <vl_context.h> @@ -26,7 +26,7 @@ Status XvMCCreateBlocks(Display *display, XvMCContext *context, unsigned int num blocks->context_id = context->context_id; blocks->num_blocks = num_blocks; - blocks->blocks = malloc(BLOCK_SIZE * num_blocks); + blocks->blocks = MALLOC(BLOCK_SIZE * num_blocks); /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */ blocks->privData = display; @@ -38,7 +38,7 @@ Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *blocks) assert(display); assert(blocks); assert(display == blocks->privData); - free(blocks->blocks); + FREE(blocks->blocks); return Success; } @@ -61,7 +61,7 @@ Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context, unsigned in blocks->context_id = context->context_id; blocks->num_blocks = num_blocks; - blocks->macro_blocks = malloc(sizeof(XvMCMacroBlock) * num_blocks); + blocks->macro_blocks = MALLOC(sizeof(XvMCMacroBlock) * num_blocks); /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */ blocks->privData = display; @@ -73,7 +73,7 @@ Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *blocks) assert(display); assert(blocks); assert(display == blocks->privData); - free(blocks->macro_blocks); + FREE(blocks->macro_blocks); return Success; } |