diff options
| author | Brian Paul <brianp@vmware.com> | 2009-11-04 17:57:20 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-11-04 17:57:20 -0700 |
| commit | 898de4a9d5e47ed32c600e5907476fd9338aa7e9 (patch) | |
| tree | b06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec /src/mesa/main/imports.c | |
| parent | fe86f8d73268785b31bc8d5a278a233bff42034d (diff) | |
| parent | 1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
Diffstat (limited to 'src/mesa/main/imports.c')
| -rw-r--r-- | src/mesa/main/imports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 91d8d156b8..46ffb929b6 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -108,8 +108,8 @@ _mesa_align_malloc(size_t bytes, unsigned long alignment) { #if defined(HAVE_POSIX_MEMALIGN) void *mem; - - (void) posix_memalign(& mem, alignment, bytes); + int err = posix_memalign(& mem, alignment, bytes); + (void) err; return mem; #elif defined(_WIN32) && defined(_MSC_VER) return _aligned_malloc(bytes, alignment); |