Fix conflicts with glibc globals

When compiling libvirt with GCC 3.4.6 the following warning is being triggered quite a lot:

util/memory.h:60: warning: declaration of 'remove' shadows a global declaration
/usr/include/stdio.h:175: warning: shadowed declaration is here

Fix this by renaming the parameter to 'toremove'.

diff --git a/AUTHORS b/AUTHORS
index 175b2cfeb4da70d927a6212374a16d172e23985e..5e540ea6810e1ec0a5b10b40078deff9bfd93aff 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -148,6 +148,7 @@ Patches have also been contributed by:
   Juerg Haefliger      <juerg.haefliger@hp.com>
   Matthias Dahl        <mdvirt@designassembly.de>
   Niels de Vos         <ndevos@redhat.com>
+  Davidlohr Bueso      <dave@gnu.org>
 
   [....send patches to get your name here....]
 

diff --git a/src/util/memory.h b/src/util/memory.h
index 750a6b01817da5d130f3e2c11b19a93e16bc4327..66b4c420fa9bf7c1ad7c76d5529092c784db5567 100644 (file)
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -57,7 +57,7 @@ int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add)
 int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count,
                size_t desired)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
-void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t remove)
+void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t toremove)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 int virAllocVar(void *ptrptr,
                 size_t struct_size,