New silcconfig library and server parser. Merged silc-newconfig-final.patch.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 56e265398869b3d974007957750c024df2965c16..fb68ce56c02f9bec916b242bcb876c5ae771fa53 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>
@@ -219,8 +233,8 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
+#ifndef __cplusplus
 #ifndef bool
-#ifndef CXX
 #define bool unsigned char
 #endif
 #endif