updates.

diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c
index 12763c0f00eb31f0fca75541033546ec3de3c4de..2c8914cd609eaf521f78eb5b138619a416db6e34 100644 (file)
--- a/apps/silcd/silcd.c
+++ b/apps/silcd/silcd.c
@@ -37,6 +37,8 @@ silc_server_create_key_pair(char *pkcs_name, int bits, char *path,
                            SilcPublicKey *ret_pub_key,
                            SilcPrivateKey *ret_prv_key);
 
+SILC_MUTEX_DEFINE(testi);
+
 /* Long command line options */
 static struct option long_opts[] = 
 {

diff --git a/lib/silcutil/silcmutex.h b/lib/silcutil/silcmutex.h
index 70eed3c3c263338bda5806acdf72e7c7cf88e8c5..ef02621ee07d19bb3346a9466edceb3ab2facfce 100644 (file)
--- a/lib/silcutil/silcmutex.h
+++ b/lib/silcutil/silcmutex.h
@@ -31,7 +31,7 @@
 #ifndef SILCMUTEX_H
 #define SILCMUTEX_H
 
-/* Prototypes */
+#ifdef SILC_THREADS
 
 /****s* silcutil/SilcMutexAPI/SilcMutex
  *
@@ -48,6 +48,23 @@
  ***/
 typedef struct SilcMutexStruct *SilcMutex;
 
+/****d* silcutil/SilcMutexAPI/SILC_MUTEX_DEFINE
+ *
+ * NAME
+ * 
+ *    #define SILC_MUTEX_DEFINE(name) ...
+ *
+ * DESCRIPTION
+ *
+ *    This macro is used to define new mutex.  Use this macro in an
+ *    environment that can be compiled with or without the SILC Mutex
+ *    API. This is equivalent to defining SilcMutex `name'; directly.
+ *
+ * SOURCE
+ */
+#define SILC_MUTEX_DEFINE(name) SilcMutex name
+/***/
+
 /****f* silcutil/SilcMutexAPI/silc_mutex_alloc
  *
  * SYNOPSIS
@@ -116,4 +133,14 @@ void silc_mutex_lock(SilcMutex mutex);
  ***/
 void silc_mutex_unlock(SilcMutex mutex);
 
+#else
+
+#define SILC_MUTEX_DEFINE(name)
+#define silc_mutex_alloc()
+#define silc_mutex_free(mutex)
+#define silc_mutex_lock(mutex)
+#define silc_mutex_unlock(mutex)
+
+#endif         /* SILC_THREADS */
+
 #endif