updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 7ea22a48a8e9600aa596b357c85b6b47fe2818e3..296972f47c0d28cc0195c656a8cb0ac6a2eadf8b 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -28,6 +28,12 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef WIN32
+#ifndef SILC_WIN32
+#define SILC_WIN32
+#endif
+#endif
+
 #ifdef SILC_WIN32
 #include "silcwin32.h"
 #endif
@@ -88,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
@@ -124,6 +134,10 @@
 #include <regex.h>
 #endif
 
+#ifdef SILC_HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
 #endif                         /* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG
@@ -166,19 +180,23 @@ 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;
+#endif
 #else
 typedef uint32 uint64;
 typedef int32 int64;
@@ -208,6 +226,8 @@ typedef uint32 * void *;
 #include "silcpkcs.h"
 
 /* SILC util library includes */
+#include "silcmutex.h"
+#include "silcthread.h"
 #include "silchashtable.h"
 #include "silclog.h"
 #include "silcmemory.h"
@@ -217,14 +237,13 @@ typedef uint32 * void *;
 #include "silcnet.h"
 #include "silcutil.h"
 #include "silcconfig.h"
-#include "silctask.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"
@@ -249,5 +268,8 @@ typedef uint32 * void *;
 #include "payload.h"
 #include "groups.h"
 
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
 
+#endif