Mesa (master): util: silence warnings for third REALLOC argument

Keith Whitwell keithw at kemper.freedesktop.org
Thu Aug 13 13:28:54 UTC 2009


Module: Mesa
Branch: master
Commit: 120e76866b4b0d136ae4ed377c6ff96454e39b95
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=120e76866b4b0d136ae4ed377c6ff96454e39b95

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Aug 13 14:26:50 2009 +0100

util: silence warnings for third REALLOC argument

Our fallback realloc path requires an old_size argument, but the posix
varient doesn't need this.  Add some code to avoid gcc unused variable
warnings for this extra argument.

---

 src/gallium/auxiliary/util/u_memory.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_memory.h b/src/gallium/auxiliary/util/u_memory.h
index 0b18d04..c3f8c91 100644
--- a/src/gallium/auxiliary/util/u_memory.h
+++ b/src/gallium/auxiliary/util/u_memory.h
@@ -100,8 +100,14 @@ ExFreePool(void *P);
 #define MALLOC( SIZE )  malloc( SIZE )
 #define CALLOC( COUNT, SIZE )   calloc( COUNT, SIZE )
 #define FREE( PTR )  free( PTR )
-#define REALLOC( OLDPTR, OLDSIZE, NEWSIZE )  realloc( OLDPTR, NEWSIZE )
 
+static INLINE void *
+_REALLOC( void *old_ptr, unsigned old_size, unsigned new_size )
+{
+   (void) old_size;
+   return realloc(old_ptr, new_size);
+}
+#define REALLOC( a, b, c ) _REALLOC( a, b, c )
 #endif
 
 




More information about the mesa-commit mailing list