updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 7ee3c0d03cb8b67af3be2b981f403c8b59440f75..c7182023028bd443f67b36dd1f12fde9c08223f8 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -34,10 +34,24 @@
 #endif
 #endif
 
+#if defined(__EPOC32__)
+#ifndef SILC_EPOC
+#define SILC_EPOC
+#endif
+#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>
@@ -138,6 +152,10 @@
 #include <pthread.h>
 #endif
 
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #endif                         /* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG
@@ -151,6 +169,11 @@
 #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
@@ -210,8 +233,8 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
+#ifndef __cplusplus
 #ifndef bool
-#ifndef CXX
 #define bool unsigned char
 #endif
 #endif
@@ -233,16 +256,18 @@ typedef uint32 * void *;
 /* SILC util library includes */
 #include "silcmutex.h"
 #include "silcthread.h"
+#include "silcschedule.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 "silcfileutil.h"
 #include "silcutil.h"
 #include "silcconfig.h"
-#include "silcschedule.h"
 #include "silcprotocol.h"
 #include "silcsockconn.h"
 
@@ -258,10 +283,6 @@ typedef uint32 * void *;
 #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"
@@ -270,8 +291,8 @@ typedef uint32 * void *;
 
 /* 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"