updates.

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 224525d5887fd4f81576604c983cff119e8d32cb..4fd2d575ba27c2e4109ded0047b127087c520efa 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -137,12 +137,13 @@
 #undef int16
 #undef int32
 #undef int64
+#undef bool
 
 typedef unsigned char uint8;
 typedef signed char int8;
 
 #if SILC_SIZEOF_SHORT > 2
-#error "size of the short must be 2 bytes"
+#error "sizeof short must be 2 bytes"
 #endif
 
 typedef unsigned short uint16;
@@ -180,9 +181,7 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
-#ifndef bool
-#define bool unsigned char
-#endif
+typedef unsigned char bool;
 
 /* Generic global SILC includes */
 #include "bitmove.h"

diff --git a/lib/silcutil/silcconfig.c b/lib/silcutil/silcconfig.c
index 97b48a46dcb2bc22ef91cfa1fd369970effcfed7..56155372e31584bde6e8321c6ae56570b5c352b9 100644 (file)
--- a/lib/silcutil/silcconfig.c
+++ b/lib/silcutil/silcconfig.c
@@ -27,7 +27,7 @@
 void silc_config_open(char *filename, SilcBuffer *ret_buffer)
 {
   char *buffer;
-  int filelen;
+  uint32 filelen;
 
   buffer = silc_file_read(filename, &filelen);
   if (buffer == NULL)