updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 63c9da34a06fdf05bdb77876a0a0b9d8e6b04d72..3520afd1942b25da8988d39ff9d2fc9115f9ba05 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -196,6 +196,9 @@ typedef signed long int64;
 #ifndef WIN32
 typedef unsigned long long uint64;
 typedef signed long long int64;
+#else
+typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */
+typedef int32 int64;
 #endif
 #else
 typedef uint32 uint64;
@@ -208,8 +211,10 @@ typedef uint32 * void *;
 #endif
 
 #ifndef bool
+#ifndef CXX
 #define bool unsigned char
 #endif
+#endif
 
 /* Generic global SILC includes */
 #include "bitmove.h"
@@ -238,12 +243,12 @@ typedef uint32 * void *;
 #include "silcutil.h"
 #include "silcconfig.h"
 #include "silcschedule.h"
+#include "silcprotocol.h"
+#include "silcsockconn.h"
 
 /* SILC core library includes */
 #include "silcid.h"
 #include "silcidcache.h"
-#include "silcprotocol.h"
-#include "silcsockconn.h"
 #include "silcpayload.h"
 #include "silccommand.h"
 #include "silcchannel.h"
@@ -268,5 +273,8 @@ typedef uint32 * void *;
 #include "payload.h"
 #include "groups.h"
 
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
 
+#endif