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 3f9c41b4e6717b926760790dffa5c3127c93cdc4..296972f47c0d28cc0195c656a8cb0ac6a2eadf8b 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-28,19
+28,23
@@
/* Automatically generated configuration header */
#include "silcdefs.h"
/* Automatically generated configuration header */
#include "silcdefs.h"
+#ifdef WIN32
+#ifndef SILC_WIN32
+#define SILC_WIN32
+#endif
+#endif
+
#ifdef SILC_WIN32
#include "silcwin32.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef SILC_WIN32
#include "silcwin32.h"
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/time.h>
#include <time.h>
#ifdef HAVE_SIGNAL_H
#include <time.h>
#ifdef HAVE_SIGNAL_H
@@
-69,6
+73,8
@@
#ifndef SILC_WIN32
#ifndef SILC_WIN32
+#include <unistd.h>
+#include <sys/time.h>
#include <pwd.h>
#include <grp.h>
#include <sys/times.h>
#include <pwd.h>
#include <grp.h>
#include <sys/times.h>
@@
-88,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
@@
-118,18
+128,22
@@
#include <limits.h>
#endif
#include <limits.h>
#endif
-#endif /* !SILC_WIN32 */
-
-#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
-#endif
-
#ifndef HAVE_REGEX_H
#include "../lib/contrib/regex.h"
#else
#include <regex.h>
#endif
#ifndef HAVE_REGEX_H
#include "../lib/contrib/regex.h"
#else
#include <regex.h>
#endif
+#ifdef SILC_HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
+#endif /* !SILC_WIN32 */
+
+#ifndef HAVE_GETOPT_LONG
+#include "../lib/contrib/getopt.h"
+#endif
+
#ifndef TRUE
#define TRUE 1
#endif
#ifndef TRUE
#define TRUE 1
#endif
@@
-166,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;
@@
-208,6
+226,8
@@
typedef uint32 * void *;
#include "silcpkcs.h"
/* SILC util library includes */
#include "silcpkcs.h"
/* SILC util library includes */
+#include "silcmutex.h"
+#include "silcthread.h"
#include "silchashtable.h"
#include "silclog.h"
#include "silcmemory.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 "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"
@@
-249,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