X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilcincludes.h;h=c7182023028bd443f67b36dd1f12fde9c08223f8;hb=386c883d8774999c6e74d7c6c37e52e4163a4cb1;hp=d553e9055ca6eb014fae8b15a90290a2d7ac8f84;hpb=8ceff2f9e9d065106b1e0490b2a82d76394647c7;p=silc.git

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index d553e905..c7182023 100644
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -34,10 +34,20 @@
 #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
@@ -223,8 +233,8 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
+#ifndef __cplusplus
 #ifndef bool
-#ifndef CXX
 #define bool unsigned char
 #endif
 #endif
@@ -253,9 +263,9 @@ typedef uint32 * void *;
 #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 "silcprotocol.h"
@@ -281,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"