X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilcincludes.h;h=ebdea361e518c19f7ca92cc220efbf88c60b6410;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=7ee3c0d03cb8b67af3be2b981f403c8b59440f75;hpb=4e64dd02ccecc9c497b8db8ecb09d017b9cef9a4;p=silc.git

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 7ee3c0d0..ebdea361 100644
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -28,16 +28,60 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef WIN32
 #ifndef SILC_WIN32
 #define SILC_WIN32
 #endif
 #endif
 
+#if defined(__EPOC32__)
+#ifndef SILC_EPOC
+#define SILC_EPOC
+#endif
+#endif
+
+#ifdef BEOS
+#ifndef SILC_BEOS
+#define SILC_BEOS
+#endif
+#elif defined(__BEOS__)
+#ifndef SILC_BEOS
+#define SILC_BEOS
+#endif
+#endif
+
+#if defined(OS2)
+#ifndef SILC_OS2
+#define SILC_OS2
+#endif
+#endif
+
+/* Platform specific includes */
+
 #ifdef SILC_WIN32
 #include "silcwin32.h"
 #endif
 
+#ifdef SILC_EPOC
+#include "silcepoc.h"
+#endif
+
+#ifdef SILC_BEOS
+#include "silcbeos.h"
+#endif
+
+#ifdef SILC_OS2
+#include "silcos2.h"
+#endif
+
+#ifndef DLLAPI
+#define DLLAPI
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -138,6 +182,10 @@
 #include <pthread.h>
 #endif
 
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #endif				/* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG
@@ -151,67 +199,64 @@
 #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
-#undef uint32
-#undef uin64
-#undef int8
-#undef int16
-#undef int32
-#undef int64
-
-typedef unsigned char uint8;
-typedef signed char int8;
+
+typedef unsigned char SilcUInt8;
+typedef signed char SilcInt8;
 
 #if SILC_SIZEOF_SHORT > 2
 #error "size of the short must be 2 bytes"
 #endif
 
-typedef unsigned short uint16;
-typedef signed short int16;
+typedef unsigned short SilcUInt16;
+typedef signed short SilcInt16;
 
 #if SILC_SIZEOF_LONG == 4
-typedef unsigned long uint32;
-typedef signed long int32;
+typedef unsigned long SilcUInt32;
+typedef signed long SilcInt32;
 #else
 #if SILC_SIZEOF_INT == 4
-typedef unsigned long uint32;
-typedef signed long int32;
+typedef unsigned int SilcUInt32;
+typedef signed int SilcInt32;
 #else
 #if SILC_SIZEOF_LONG_LONG >= 4
 #ifndef WIN32
-typedef unsigned long long uint32;
-typedef signed long long int32;
+typedef unsigned long long SilcUInt32;
+typedef signed long long SilcInt32;
 #endif
 #endif
 #endif
 #endif
 
 #if SILC_SIZEOF_LONG >= 8
-typedef unsigned long uint64;
-typedef signed long int64;
+typedef unsigned long SilcUInt64;
+typedef signed long SilcInt64;
 #else
 #if SILC_SIZEOF_LONG_LONG >= 8
 #ifndef WIN32
-typedef unsigned long long uint64;
-typedef signed long long int64;
+typedef unsigned long long SilcUInt64;
+typedef signed long long SilcInt64;
 #else
-typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */
-typedef int32 int64;
+typedef SilcUInt32 SilcUInt64; /* XXX Use Windows's own 64 bit types */
+typedef SilcInt32 SilcInt64;
 #endif
 #else
-typedef uint32 uint64;
-typedef int32 int64;
+typedef SilcUInt32 SilcUInt64;
+typedef SilcInt32 SilcInt64;
 #endif
 #endif
 
 #if SILC_SIZEOF_VOID_P < 4
-typedef uint32 * void *;
+typedef SilcUInt32 * void *;
 #endif
 
+#ifndef __cplusplus
 #ifndef bool
-#ifndef CXX
 #define bool unsigned char
 #endif
 #endif
@@ -233,16 +278,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 +305,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,11 +313,15 @@ 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"
 #include "silcsftp_fs.h"
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* SILCINCLUDES_H */