--- deliantra/server/common/utils.C	2006/12/16 21:40:26	1.24
+++ deliantra/server/common/utils.C	2006/12/17 23:10:34	1.25
@@ -559,9 +559,9 @@
 }
 #endif
 
-void *salloc (int size) throw (std::bad_alloc)
+void *salloc_ (int n) throw (std::bad_alloc)
 {
-  void *ptr = g_slice_alloc (size);
+  void *ptr = g_slice_alloc (n);
 
   if (!ptr)
     throw std::bad_alloc ();
@@ -569,14 +569,14 @@
   return ptr;
 }
 
-void *salloc (int size, void *src) throw (std::bad_alloc)
+void *salloc_ (int n, void *src) throw (std::bad_alloc)
 {
-  void *ptr = salloc (size);
+  void *ptr = salloc_ (n);
 
   if (src)
-    memcpy (ptr, src, size);
+    memcpy (ptr, src, n);
   else
-    memset (ptr, 0, size);
+    memset (ptr, 0, n);
 
   return ptr;
 }