updates.

diff --git a/acconfig.h.pre b/acconfig.h.pre
index 8803af47c729e90a87049070400d8e55c2a07dac..5b61eb24cd86ebbec69f8e1c9a4204d7decd7344 100644 (file)
--- a/acconfig.h.pre
+++ b/acconfig.h.pre
@@ -4,9 +4,6 @@
 /* Version of the package. */
 #undef VERSION
 
-/* Debugging */
-#undef SILC_DEBUG
-
 /* Default configuration file */
 #undef SILC_SERVER_CONFIG_FILE
 
@@ -15,9 +12,17 @@
 
 /* These can be defined only on other than Win32 systems */
 #ifndef SILC_WIN32
+
+/* Debugging */
+#undef SILC_DEBUG
+
+/* Multi-thread support */
 #undef SILC_HAVE_PTHREAD
+
+/* IPv6 Support */
 #undef HAVE_IPV6
-#endif
+
+#endif /* SILC_WIN32 */
 
 /* Default paths */
 #undef SILC_ETCDIR

diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index 80dc21431eac327eb5355a883b5bc8b1729a11ad..ecaa1b2b2894cd5efe52d1c203b2d28a2ab1036d 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -173,7 +173,7 @@ static void silc_register_cipher(SilcClient client, const char *cipher)
   if (cipher) {
     for (i = 0; silc_default_ciphers[i].name; i++)
       if (!strcmp(silc_default_ciphers[i].name, cipher)) {
-       silc_cipher_register(&silc_default_ciphers[i]);
+       silc_cipher_register((SilcCipherObject *)&silc_default_ciphers[i]);
        break;
       }
     
@@ -194,7 +194,7 @@ static void silc_register_hash(SilcClient client, const char *hash)
   if (hash) {
     for (i = 0; silc_default_hash[i].name; i++)
       if (!strcmp(silc_default_hash[i].name, hash)) {
-       silc_hash_register(&silc_default_hash[i]);
+       silc_hash_register((SilcHashObject *)&silc_default_hash[i]);
        break;
       }
     
@@ -215,7 +215,7 @@ static void silc_register_hmac(SilcClient client, const char *hmac)
   if (hmac) {
     for (i = 0; silc_default_hmacs[i].name; i++)
       if (!strcmp(silc_default_hmacs[i].name, hmac)) {
-       silc_hmac_register(&silc_default_hmacs[i]);
+       silc_hmac_register((SilcHmacObject *)&silc_default_hmacs[i]);
        break;
       }
     

diff --git a/lib/silcmath/Makefile.am b/lib/silcmath/Makefile.am
index 6ef0c4f4d97bf827dae5454e7e6591fc09cf7b6b..8662b3f254ff62a3cadfb4fd8f6788c715a4bd96 100644 (file)
--- a/lib/silcmath/Makefile.am
+++ b/lib/silcmath/Makefile.am
@@ -29,13 +29,13 @@ noinst_LIBRARIES = libsilcmath.a
 if SILC_MP_NSS_MPI
 MP_SOURCE = mp_mpi.c
 if SILC_DIST_TOOLKIT
-MP_HEADERS = mpi/mpi.h mpi/mplogic.h mpi/mpprime.h mpi/mpi-config.h
+MP_HEADER = mpi/mpi.h mpi/mplogic.h mpi/mpprime.h mpi/mpi-config.h
 else
-MP_HEADERS =
+MP_HEADER =
 endif
 else
 MP_SOURCE = mp_gmp.c
-MP_HEADERS =
+MP_HEADER =
 endif
 
 libsilcmath_a_SOURCES = \
@@ -50,7 +50,7 @@ include_HEADERS =     \
        mp_mpi.h        \
        silcmath.h      \
        silcmp.h        \
-       $(MP_HEADERS)
+       $(MP_HEADER)
 endif
 
 EXTRA_DIST = *.h