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 63c9da34a06fdf05bdb77876a0a0b9d8e6b04d72..c7182023028bd443f67b36dd1f12fde9c08223f8 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-34,10
+34,24
@@
#endif
#endif
#endif
#endif
+#if defined(__EPOC32__)
+#ifndef SILC_EPOC
+#define SILC_EPOC
+#endif
+#endif
+
#ifdef SILC_WIN32
#include "silcwin32.h"
#endif
#ifdef SILC_WIN32
#include "silcwin32.h"
#endif
+#ifdef SILC_EPOC
+#include "silcepoc.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>
@@
-138,6
+152,10
@@
#include <pthread.h>
#endif
#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
@@
-151,6
+169,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
@@
-196,6
+219,9
@@
typedef signed long int64;
#ifndef WIN32
typedef unsigned long long uint64;
typedef signed long long int64;
#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;
#endif
#else
typedef uint32 uint64;
@@
-207,9
+233,11
@@
typedef int32 int64;
typedef uint32 * void *;
#endif
typedef uint32 * void *;
#endif
+#ifndef __cplusplus
#ifndef bool
#define bool unsigned char
#endif
#ifndef bool
#define bool unsigned char
#endif
+#endif
/* Generic global SILC includes */
#include "bitmove.h"
/* Generic global SILC includes */
#include "bitmove.h"
@@
-228,23
+256,25
@@
typedef uint32 * void *;
/* SILC util library includes */
#include "silcmutex.h"
#include "silcthread.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 "silcbuffer.h"
-#include "silcbufutil.h"
#include "silcbuffmt.h"
#include "silcnet.h"
#include "silcbuffmt.h"
#include "silcnet.h"
+#include "silcfileutil.h"
#include "silcutil.h"
#include "silcconfig.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"
/* 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"
@@
-253,10
+283,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"
@@
-265,8
+291,11
@@
typedef uint32 * void *;
/* SILC Key Exchange library includes */
#include "silcske.h"
/* SILC Key Exchange library includes */
#include "silcske.h"
-#include "payload.h"
-#include "groups.h"
+#include "
silcske_
payload.h"
+#include "
silcske_
groups.h"
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
+#endif