Made private key regeneration after it has expired optional.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index ebdea361e518c19f7ca92cc220efbf88c60b6410..8fe2ccfe2b03e32a1777ced8e481dfc9caa140aa 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -25,41 +25,48 @@
 #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
 
+/* Automatically generated configuration header */
+#include "silcdefs.h"
+
 /* Platform specific includes */
 
 #ifdef SILC_WIN32
@@ -186,83 +193,22 @@ extern "C" {
 #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
-#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 */
-
-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_TERMIOS_H
+#include <termios.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_UTIME_H
+#include <utime.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 "../lib/contrib/getopt.h"
 #endif
 
-/* Generic global SILC includes */
-#include "bitmove.h"
+/* Include generic SILC type definitions */
+#include "silctypes.h"
 
 /* Math library includes */
 #include "silcmp.h"
@@ -288,12 +234,14 @@ 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"
 
 /* SILC core library includes */
+#include "silcstatus.h"
 #include "silcid.h"
 #include "silcidcache.h"
 #include "silcargument.h"