updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 20855d040a400dec80bb67924d81ce809e423c04..9117082c4a2525cb0438f0e75c1cf90e4d217dca 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
@@ -176,20 +180,27 @@ typedef unsigned long uint32;
 typedef signed long int32;
 #else
 #if SILC_SIZEOF_LONG_LONG >= 4
+#ifndef WIN32
 typedef unsigned long long uint32;
 typedef signed long long int32;
 #endif
 #endif
 #endif
+#endif
 
 #if SILC_SIZEOF_LONG >= 8
 typedef unsigned long uint64;
 typedef signed long int64;
 #else
 #if SILC_SIZEOF_LONG_LONG >= 8
+#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;
 typedef int32 int64;
 #endif
@@ -200,8 +211,10 @@ typedef uint32 * void *;
 #endif
 
 #ifndef bool
+#ifndef CXX
 #define bool unsigned char
 #endif
+#endif
 
 /* Generic global SILC includes */
 #include "bitmove.h"
@@ -220,6 +233,7 @@ typedef uint32 * void *;
 /* SILC util library includes */
 #include "silcmutex.h"
 #include "silcthread.h"
+#include "silcschedule.h"
 #include "silchashtable.h"
 #include "silclog.h"
 #include "silcmemory.h"
@@ -229,14 +243,13 @@ typedef uint32 * void *;
 #include "silcnet.h"
 #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 "silcargument.h"
 #include "silccommand.h"
 #include "silcchannel.h"
 #include "silcpacket.h"
@@ -260,5 +273,8 @@ typedef uint32 * void *;
 #include "payload.h"
 #include "groups.h"
 
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
 
+#endif