--- deliantra/server/common/compat.C	2009/11/04 00:02:47	1.1
+++ deliantra/server/common/compat.C	2009/11/07 18:30:05	1.4
@@ -162,10 +162,10 @@
 int
 die_roll (int num, int size, const object *op, int goodbad)
 {
-  int min, luck, total, i, gotlucky;
+  int min_roll, luck, total, i, gotlucky;
 
   int diff = size;
-  min = 1;
+  min_roll = 1;
   luck = total = gotlucky = 0;
   int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
 
@@ -180,7 +180,7 @@
 
   for (i = 0; i < num; i++)
     {
-      if (rndm (base) < MIN (10, abs (luck)) && !gotlucky)
+      if (rndm (base) < min (10, abs (luck)) && !gotlucky)
         {
           /* we have a winner */
           gotlucky++;
@@ -188,8 +188,8 @@
           diff -= luck;
           if (diff < 1)
             return (num);       /*check again */
-          ((goodbad) ? (min += luck) : (diff));
-          total += MAX (1, MIN (size, rndm (diff) + min));
+          ((goodbad) ? (min_roll += luck) : (diff));
+          total += max (1, min (size, rndm (diff) + min_roll));
         }
       else
         total += rndm (size) + 1;
@@ -235,7 +235,7 @@
   return path;
 }
 
-void
+static void
 path_normalize (char *path)
 {
   char *p;                      /* points to the beginning of the path not yet processed; this is
@@ -316,31 +316,6 @@
   return (path);
 }
 
-char *
-strcasestr_local (const char *s, const char *find)
-{
-  char c, sc;
-  size_t len;
-
-  if ((c = *find++) != 0)
-    {
-      c = tolower (c);
-      len = strlen (find);
-      do
-        {
-          do
-            {
-              if ((sc = *s++) == 0)
-                return NULL;
-            }
-          while (tolower (sc) != c);
-        }
-      while (strncasecmp (s, find, len) != 0);
-      s--;
-    }
-  return (char *) s;
-}
-
 /**
  * open_and_uncompress() first searches for the original filename. If it exist,
  * then it opens it and returns the file-pointer.
@@ -392,21 +367,6 @@
   *dest = '\0';
 }
 
-const char *
-strrstr (const char *haystack, const char *needle)
-{
-  const char *lastneedle;
-
-  lastneedle = NULL;
-  while ((haystack = strstr (haystack, needle)) != NULL)
-    {
-      lastneedle = haystack;
-      haystack++;
-    }
-  return lastneedle;
-
-}
-
 #define EOL_SIZE (sizeof("\n")-1)
 void
 strip_endline (char *buf)