updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index fb326df689f59040726fb78fd1bcd5012f874d70..755b26861200ceed5c4291a39f9a04e13cd3d167 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -94,10 +94,14 @@
 #error netinet/in.h not found in the system
 #endif
 
+#ifdef HAVE_XTI_H
+#include <xti.h>
+#else
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #else
-#error netinet/tcp.h not found in the system
+#error xti.h nor even netinet/tcp.h found in the system
+#endif
 #endif
 
 #ifdef HAVE_NETDB_H
@@ -192,7 +196,10 @@ typedef signed long int64;
 #ifndef WIN32
 typedef unsigned long long uint64;
 typedef signed long long int64;
-#endif
+#else
+typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */\r
+typedef int32 int64;\r
+#endif\r
 #else
 typedef uint32 uint64;
 typedef int32 int64;
@@ -234,12 +241,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"
@@ -264,5 +271,8 @@ typedef uint32 * void *;
 #include "payload.h"
 #include "groups.h"
 
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
 
+#endif