[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.67 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.68 by root, Tue Apr 15 03:16:02 2008 UTC

 #ifndef UTIL_H__
 #define UTIL_H__
 #define DEBUG_SALLOC 0
-#define PREFER_MALLOC 0
+#define PREFER_MALLOC 1
 #if __GNUC__ >= 3
 # define is_constant(c)             __builtin_constant_p (c)
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
 void *g_slice_alloc0 (unsigned long size);
 void g_slice_free1 (unsigned long size, void *ptr);
 #elif PREFER_MALLOC
 # define g_slice_alloc0(s) calloc (1, (s))
 # define g_slice_alloc(s) malloc ((s))
-# define g_slice_free1(s,p) free ((s))
+# define g_slice_free1(s,p) free ((p))
 #endif
 // use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
 #define auto(var,expr) decltype(expr) var = (expr)
 #else
  #define SMUTEX_INITIALISER PTHREAD_MUTEX_INITIALIZER
 #endif
 #define SMUTEX(name) smutex name = SMUTEX_INITIALISER
-#define SMUTEX_LOCK(name) pthread_mutex_lock (&(name))
+#define SMUTEX_LOCK(name)   pthread_mutex_lock   (&(name))
 #define SMUTEX_UNLOCK(name) pthread_mutex_unlock (&(name))
+typedef pthread_cond_t scond;
+#define SCOND(name) scond name = PTHREAD_COND_INITIALIZER
+#define SCOND_SIGNAL(name)     pthread_cond_signal    (&(name))
+#define SCOND_BROADCAST(name)  pthread_cond_broadcast (&(name))
+#define SCOND_WAIT(name,mutex) pthread_cond_wait      (&(name), &(mutex))
 #endif

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