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 1c4ef761c8fa2c9fd2df20d056a5e92d09d68258..d553e9055ca6eb014fae8b15a90290a2d7ac8f84 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-38,6
+38,10
@@
#include "silcwin32.h"
#endif
#include "silcwin32.h"
#endif
+#ifndef DLLAPI
+#define DLLAPI
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-94,10
+98,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,6
+138,14
@@
#include <regex.h>
#endif
#include <regex.h>
#endif
+#ifdef SILC_HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
@@
-143,6
+159,11
@@
#define FALSE 0
#endif
#define FALSE 0
#endif
+/* Define offsetof */
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
/* Define types. The types must be at least of the specified size */
#undef uint8
#undef uint16
/* Define types. The types must be at least of the specified size */
#undef uint8
#undef uint16
@@
-172,20
+193,27
@@
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;
#else
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
typedef uint32 uint64;
typedef int32 int64;
#endif
@@
-196,8
+224,10
@@
typedef uint32 * void *;
#endif
#ifndef bool
#endif
#ifndef bool
+#ifndef CXX
#define bool unsigned char
#endif
#define bool unsigned char
#endif
+#endif
/* Generic global SILC includes */
#include "bitmove.h"
/* Generic global SILC includes */
#include "bitmove.h"
@@
-214,24
+244,27
@@
typedef uint32 * void *;
#include "silcpkcs.h"
/* SILC util library includes */
#include "silcpkcs.h"
/* SILC util library includes */
+#include "silcmutex.h"
+#include "silcthread.h"
+#include "silcschedule.h"
#include "silchashtable.h"
#include "silclog.h"
#include "silcmemory.h"
#include "silchashtable.h"
#include "silclog.h"
#include "silcmemory.h"
+#include "silclist.h"
+#include "silcdlist.h"
#include "silcbuffer.h"
#include "silcbufutil.h"
#include "silcbuffmt.h"
#include "silcnet.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcbuffer.h"
#include "silcbufutil.h"
#include "silcbuffmt.h"
#include "silcnet.h"
#include "silcutil.h"
#include "silcconfig.h"
-#include "silc
task
.h"
-#include "silcs
chedule
.h"
+#include "silc
protocol
.h"
+#include "silcs
ockconn
.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 "silcargument.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
@@
-240,10
+273,6
@@
typedef uint32 * void *;
#include "silcauth.h"
#include "silcprivate.h"
#include "silcauth.h"
#include "silcprivate.h"
-/* TRQ (SilcList API and SilcDList API) */
-#include "silclist.h"
-#include "silcdlist.h"
-
#ifdef SILC_SIM
/* SILC Module library includes */
#include "silcsim.h"
#ifdef SILC_SIM
/* SILC Module library includes */
#include "silcsim.h"
@@
-255,5
+284,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