From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 3 Apr 2001 19:17:06 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: SILC.0.1~55
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=2be0be2432fff760084c4093291e79f1fa6262d8;p=silc.git

	updates.
---

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 224525d5..4fd2d575 100644
--- 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 97b48a46..56155372 100644
--- 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)