Do not include silcdefs.h in installed headers anymore. Include

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 0291158c4002bf1cfd372a03d4c6e25f28bb711a..2580ea0906997c828e4981387123b56f307a2be6 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -25,27 +25,68 @@
 #ifndef SILCINCLUDES_H
 #define SILCINCLUDES_H
 
-/* Automatically generated configuration header */
-#include "silcdefs.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SILC_UNIX
 
 #ifdef WIN32
 #ifndef SILC_WIN32
 #define SILC_WIN32
+#undef SILC_UNIX
 #endif
 #endif
 
 #if defined(__EPOC32__)
+#ifndef SILC_EPOC
 #define SILC_EPOC
+#undef SILC_UNIX
+#endif
+#endif
+
+#ifdef BEOS
+#ifndef SILC_BEOS
+#define SILC_BEOS
+#undef SILC_UNIX
+#endif
+#elif defined(__BEOS__)
+#ifndef SILC_BEOS
+#define SILC_BEOS
+#undef SILC_UNIX
+#endif
+#endif
+
+#if defined(OS2)
+#ifndef SILC_OS2
+#define SILC_OS2
+#undef SILC_UNIX
+#endif
 #endif
 
-#ifdef SILC_WIN32
+#if defined(HAVE_SILCDEFS_H)
+/* Automatically generated configuration header */
+#include "silcdefs.h"
+#endif /* HAVE_SILCDEFS_H */
+
+/* Platform specific includes */
+
+#if defined(SILC_WIN32)
 #include "silcwin32.h"
 #endif
 
-#ifdef SILC_EPOC
+#if defined(SILC_EPOC)
 #include "silcepoc.h"
 #endif
 
+#if defined(SILC_BEOS)
+#include "silcbeos.h"
+#endif
+
+#if defined(SILC_OS2)
+#include "silcos2.h"
+#endif
+
 #ifndef DLLAPI
 #define DLLAPI
 #endif
@@ -83,7 +124,7 @@
 #error assert.h not found in the system
 #endif
 
-#ifndef SILC_WIN32
+#if !defined(SILC_WIN32)
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -141,7 +182,7 @@
 #endif
 
 #ifndef HAVE_REGEX_H
-#include "../lib/contrib/regex.h"
+#include "regex.h"
 #else
 #include <regex.h>
 #endif
@@ -154,91 +195,35 @@
 #include <stddef.h>
 #endif
 
-#endif                         /* !SILC_WIN32 */
-
-#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
 #endif
 
-/* Define offsetof */
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#ifdef HAVE_UTIME_H
+#include <utime.h>
 #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;
-
-#if SILC_SIZEOF_SHORT > 2
-#error "size of the short must be 2 bytes"
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
 #endif
 
-typedef unsigned short uint16;
-typedef signed short int16;
-
-#if SILC_SIZEOF_LONG == 4
-typedef unsigned long uint32;
-typedef signed long int32;
-#else
-#if SILC_SIZEOF_INT == 4
-typedef unsigned long uint32;
-typedef signed long int32;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 4
-#ifndef WIN32
-typedef unsigned long long uint32;
-typedef signed long long int32;
-#endif
-#endif
-#endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
 #endif
 
-#if SILC_SIZEOF_LONG >= 8
-typedef unsigned long uint64;
-typedef signed long int64;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 8
-#ifndef WIN32
-typedef unsigned long long uint64;
-typedef signed long long int64;
-#else
-typedef uint32 uint64; /* XXX Use Windows's own 64 bit types */
-typedef int32 int64;
-#endif
-#else
-typedef uint32 uint64;
-typedef int32 int64;
-#endif
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
 #endif
 
-#if SILC_SIZEOF_VOID_P < 4
-typedef uint32 * void *;
-#endif
+#endif                         /* !SILC_WIN32 */
 
-#ifndef __cplusplus
-#ifndef bool
-#define bool unsigned char
-#endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt.h"
 #endif
 
-/* Generic global SILC includes */
-#include "bitmove.h"
+/* Include generic SILC type definitions */
+#include "silctypes.h"
+#include "silcversion.h"
 
 /* Math library includes */
 #include "silcmp.h"
@@ -261,15 +246,18 @@ 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 "silcstrutil.h"
 #include "silcutil.h"
 #include "silcconfig.h"
 #include "silcprotocol.h"
 #include "silcsockconn.h"
+#include "silcvcard.h"
 
 /* SILC core library includes */
+#include "silcstatus.h"
 #include "silcid.h"
 #include "silcidcache.h"
 #include "silcargument.h"
@@ -280,8 +268,11 @@ typedef uint32 * void *;
 #include "silcmode.h"
 #include "silcauth.h"
 #include "silcprivate.h"
+#include "silcattrs.h"
+#include "silcvcard.h"
+#include "silcapputil.h"
 
-#ifdef SILC_SIM
+#if defined(SILC_SIM)
 /* SILC Module library includes */
 #include "silcsim.h"
 #include "silcsimutil.h"
@@ -289,11 +280,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 */