updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 755b26861200ceed5c4291a39f9a04e13cd3d167..7ee3c0d03cb8b67af3be2b981f403c8b59440f75 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -197,9 +197,9 @@ typedef signed long int64;
 typedef unsigned long long uint64;
 typedef signed long long int64;
 #else
-typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */\r
-typedef int32 int64;\r
-#endif\r
+typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */
+typedef int32 int64;
+#endif
 #else
 typedef uint32 uint64;
 typedef int32 int64;
@@ -211,8 +211,10 @@ typedef uint32 * void *;
 #endif
 
 #ifndef bool
+#ifndef CXX
 #define bool unsigned char
 #endif
+#endif
 
 /* Generic global SILC includes */
 #include "bitmove.h"
@@ -247,7 +249,7 @@ typedef uint32 * void *;
 /* SILC core library includes */
 #include "silcid.h"
 #include "silcidcache.h"
-#include "silcpayload.h"
+#include "silcargument.h"
 #include "silccommand.h"
 #include "silcchannel.h"
 #include "silcpacket.h"