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 67a8b6c1c14dabe6519d088fa55eb8f14793db82..2580ea0906997c828e4981387123b56f307a2be6 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -64,24 +64,26 @@ extern "C" {
 #endif
 #endif
 
+#if defined(HAVE_SILCDEFS_H)
 /* Automatically generated configuration header */
 #include "silcdefs.h"
+#endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
 
-#ifdef SILC_WIN32
+#if defined(SILC_WIN32)
 #include "silcwin32.h"
 #endif
 
-#ifdef SILC_EPOC
+#if defined(SILC_EPOC)
 #include "silcepoc.h"
 #endif
 
-#ifdef SILC_BEOS
+#if defined(SILC_BEOS)
 #include "silcbeos.h"
 #endif
 
-#ifdef SILC_OS2
+#if defined(SILC_OS2)
 #include "silcos2.h"
 #endif
 
@@ -122,7 +124,7 @@ extern "C" {
 #error assert.h not found in the system
 #endif
 
-#ifndef SILC_WIN32
+#if !defined(SILC_WIN32)
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -180,7 +182,7 @@ extern "C" {
 #endif
 
 #ifndef HAVE_REGEX_H
-#include "../lib/contrib/regex.h"
+#include "regex.h"
 #else
 #include <regex.h>
 #endif
@@ -197,83 +199,31 @@ extern "C" {
 #include <termios.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_UTIME_H
+#include <utime.h>
 #endif
 
-/* Define offsetof */
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
 #endif
 
-/* Define types. The types must be at least of the specified size */
-
-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 SilcUInt16;
-typedef signed short SilcInt16;
-
-#if SILC_SIZEOF_LONG == 4
-typedef unsigned long SilcUInt32;
-typedef signed long SilcInt32;
-#else
-#if SILC_SIZEOF_INT == 4
-typedef unsigned int SilcUInt32;
-typedef signed int SilcInt32;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 4
-#ifndef WIN32
-typedef unsigned long long SilcUInt32;
-typedef signed long long SilcInt32;
-#endif
-#endif
-#endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
 #endif
 
-#if SILC_SIZEOF_LONG >= 8
-typedef unsigned long SilcUInt64;
-typedef signed long SilcInt64;
-#else
-#if SILC_SIZEOF_LONG_LONG >= 8
-#ifndef WIN32
-typedef unsigned long long SilcUInt64;
-typedef signed long long SilcInt64;
-#else
-typedef SilcUInt32 SilcUInt64; /* XXX Use Windows's own 64 bit types */
-typedef SilcInt32 SilcInt64;
-#endif
-#else
-typedef SilcUInt32 SilcUInt64;
-typedef SilcInt32 SilcInt64;
-#endif
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
 #endif
 
-#if SILC_SIZEOF_VOID_P < 4
-typedef SilcUInt32 * 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"
@@ -299,12 +249,15 @@ typedef SilcUInt32 * void *;
 #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"
@@ -315,8 +268,11 @@ typedef SilcUInt32 * 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"