projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates.
[silc.git]
/
includes
/
silcincludes.h
diff --git
a/includes/silcincludes.h
b/includes/silcincludes.h
index 6ffb7186c281f520de3dbffad0a86f34781aa05b..296972f47c0d28cc0195c656a8cb0ac6a2eadf8b 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-94,10
+94,14
@@
#error netinet/in.h not found in the system
#endif
#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
#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
#endif
#ifdef HAVE_NETDB_H
@@
-130,7
+134,7
@@
#include <regex.h>
#endif
#include <regex.h>
#endif
-#ifdef
HAVE_PTHREAD_H
+#ifdef
SILC_HAVE_PTHREAD
#include <pthread.h>
#endif
#include <pthread.h>
#endif
@@
-176,19
+180,23
@@
typedef unsigned long uint32;
typedef signed long int32;
#else
#if SILC_SIZEOF_LONG_LONG >= 4
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
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
#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;
typedef unsigned long long uint64;
typedef signed long long int64;
+#endif
#else
typedef uint32 uint64;
typedef int32 int64;
#else
typedef uint32 uint64;
typedef int32 int64;
@@
-229,14
+237,13
@@
typedef uint32 * void *;
#include "silcnet.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcnet.h"
#include "silcutil.h"
#include "silcconfig.h"
-#include "silctask.h"
#include "silcschedule.h"
#include "silcschedule.h"
+#include "silcprotocol.h"
+#include "silcsockconn.h"
/* SILC core library includes */
#include "silcid.h"
#include "silcidcache.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"
#include "silcpayload.h"
#include "silccommand.h"
#include "silcchannel.h"
@@
-261,5
+268,8
@@
typedef uint32 * void *;
#include "payload.h"
#include "groups.h"
#include "payload.h"
#include "groups.h"
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
+#endif