Fixed compiler warnings triggered by the test programs that include both <stdlib...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9634

diff --git a/include/pub_tool_oset.h b/include/pub_tool_oset.h
index 7706402da6aeca73bab30c312a5d2a4dfe54e102..687d34fd2711d4c3f443716e87162ba7b68ceeee 100644 (file)
--- a/include/pub_tool_oset.h
+++ b/include/pub_tool_oset.h
@@ -99,7 +99,7 @@ typedef void  (*OSetFree_t)        ( void* p );
 //   called.
 
 extern OSet* VG_(OSetWord_Create)       ( OSetAlloc_t alloc, HChar* ec, 
-                                          OSetFree_t free );
+                                          OSetFree_t _free );
 extern void  VG_(OSetWord_Destroy)      ( OSet* os );
 
 /*--------------------------------------------------------------------*/
@@ -185,7 +185,7 @@ extern Bool  VG_(OSetWord_Next)         ( OSet* os, /*OUT*/UWord* val );
 
 extern OSet* VG_(OSetGen_Create)    ( PtrdiffT keyOff, OSetCmp_t cmp,
                                       OSetAlloc_t alloc, HChar* ec,
-                                      OSetFree_t free );
+                                      OSetFree_t _free );
 extern void  VG_(OSetGen_Destroy)   ( OSet* os );
 extern void* VG_(OSetGen_AllocNode) ( OSet* os, SizeT elemSize );
 extern void  VG_(OSetGen_FreeNode)  ( OSet* os, void* elem );