[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.42 by root, Fri Jan 19 15:15:49 2007 UTC vs.
Revision 1.44 by root, Thu Jan 25 03:54:44 2007 UTC

 rand_gen rndm;
 void
 tausworthe_random_generator::seed (uint32_t seed)
 {
-  state [0] = max (  2, seed      * 69069U);
+  state [0] = max (  2U, seed      * 69069U);
-  state [1] = max (  8, state [0] * 69069U);
+  state [1] = max (  8U, state [0] * 69069U);
-  state [2] = max ( 16, state [1] * 69069U);
+  state [2] = max ( 16U, state [1] * 69069U);
-  state [3] = max (128, state [2] * 69069U);
+  state [3] = max (128U, state [2] * 69069U);
   for (int i = 11; --i; )
     operator ()();
 }
   LOG (llevError, "fork abort: %s\n", msg);
 }
 void *salloc_ (int n) throw (std::bad_alloc)
 {
+#ifdef PREFER_MALLOC
+  void *ptr = malloc (n);
+#else
   void *ptr = g_slice_alloc (n);
+#endif
   if (!ptr)
     throw std::bad_alloc ();
   return ptr;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines