updates.
[silc.git] / includes / silcincludes.h
index 4484d57675950b4f0f7f1e5be438c644379673bc..7ee3c0d03cb8b67af3be2b981f403c8b59440f75 100644 (file)
@@ -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"