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 9117082c4a2525cb0438f0e75c1cf90e4d217dca..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
@@
-210,8
+233,8
@@
typedef int32 int64;
typedef uint32 * void *;
#endif
typedef uint32 * void *;
#endif
+#ifndef __cplusplus
#ifndef bool
#ifndef bool
-#ifndef CXX
#define bool unsigned char
#endif
#endif
#define bool unsigned char
#endif
#endif
@@
-237,10
+260,12
@@
typedef uint32 * void *;
#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 "silcprotocol.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcprotocol.h"
@@
-258,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"
@@
-270,8
+291,8
@@
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"
/* SILC SFTP library */
#include "silcsftp.h"
/* SILC SFTP library */
#include "silcsftp.h"