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

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index c0c2d6e8..ebdea361 100644
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -28,6 +28,10 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef WIN32
 #ifndef SILC_WIN32
 #define SILC_WIN32
@@ -50,6 +54,12 @@
 #endif
 #endif
 
+#if defined(OS2)
+#ifndef SILC_OS2
+#define SILC_OS2
+#endif
+#endif
+
 /* Platform specific includes */
 
 #ifdef SILC_WIN32
@@ -64,6 +74,10 @@
 #include "silcbeos.h"
 #endif
 
+#ifdef SILC_OS2
+#include "silcos2.h"
+#endif
+
 #ifndef DLLAPI
 #define DLLAPI
 #endif
@@ -191,62 +205,54 @@
 #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
@@ -314,4 +320,8 @@ typedef uint32 * void *;
 #include "silcsftp.h"
 #include "silcsftp_fs.h"
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* SILCINCLUDES_H */