updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 4fd2d575ba27c2e4109ded0047b127087c520efa..296972f47c0d28cc0195c656a8cb0ac6a2eadf8b 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -1,11 +1,10 @@
-
 /*
 
   silcincludes.h
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 1997 - 2001 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,33 +28,27 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef WIN32
+#ifndef SILC_WIN32
+#define SILC_WIN32
+#endif
+#endif
+
+#ifdef SILC_WIN32
+#include "silcwin32.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
-#include <pwd.h>
-#include <grp.h>
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/times.h>
 #include <time.h>
 
-#ifdef SOCKS5
-#include "socks.h"
-#endif
-
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
-#undef __USE_GNU
 #include <signal.h>
-#define __USE_GNU 1
 #else
 #error signal.h not found in the system
 #endif
@@ -66,7 +59,7 @@
 #error fcntl.h not found in the system
 #endif
 
-#ifdef HAVE_ASSERT_H
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
 #else
 #error errno.h not found in the system
@@ -78,6 +71,22 @@
 #error assert.h not found in the system
 #endif
 
+#ifndef SILC_WIN32
+
+#include <unistd.h>
+#include <sys/time.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/times.h>
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#ifdef SOCKS5
+#include "socks.h"
+#endif
+
 #include <sys/socket.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -85,10 +94,14 @@
 #error netinet/in.h not found in the system
 #endif
 
+#ifdef HAVE_XTI_H
+#include <xti.h>
+#else
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #else
-#error netinet/tcp.h not found in the system
+#error xti.h nor even netinet/tcp.h found in the system
+#endif
 #endif
 
 #ifdef HAVE_NETDB_H
@@ -111,8 +124,8 @@
 #include <dlfcn.h>
 #endif
 
-#ifndef HAVE_GETOPT_LONG
-#include "../lib/contrib/getopt.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
 #endif
 
 #ifndef HAVE_REGEX_H
@@ -121,6 +134,16 @@
 #include <regex.h>
 #endif
 
+#ifdef SILC_HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
+#endif                         /* !SILC_WIN32 */
+
+#ifndef HAVE_GETOPT_LONG
+#include "../lib/contrib/getopt.h"
+#endif
+
 #ifndef TRUE
 #define TRUE 1
 #endif
@@ -137,13 +160,12 @@
 #undef int16
 #undef int32
 #undef int64
-#undef bool
 
 typedef unsigned char uint8;
 typedef signed char int8;
 
 #if SILC_SIZEOF_SHORT > 2
-#error "sizeof short must be 2 bytes"
+#error "size of the short must be 2 bytes"
 #endif
 
 typedef unsigned short uint16;
@@ -158,19 +180,23 @@ 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
+#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;
+#endif
 #else
 typedef uint32 uint64;
 typedef int32 int64;
@@ -181,16 +207,16 @@ typedef int32 int64;
 typedef uint32 * void *;
 #endif
 
-typedef unsigned char bool;
+#ifndef bool
+#define bool unsigned char
+#endif
 
 /* Generic global SILC includes */
 #include "bitmove.h"
 
 /* Math library includes */
 #include "silcmp.h"
-#include "modinv.h"
-#include "mpbin.h"
-#include "silcprimegen.h"
+#include "silcmath.h"
 
 /* Crypto library includes */
 #include "silccipher.h"
@@ -200,6 +226,9 @@ typedef unsigned char bool;
 #include "silcpkcs.h"
 
 /* SILC util library includes */
+#include "silcmutex.h"
+#include "silcthread.h"
+#include "silchashtable.h"
 #include "silclog.h"
 #include "silcmemory.h"
 #include "silcbuffer.h"
@@ -208,14 +237,13 @@ typedef unsigned char bool;
 #include "silcnet.h"
 #include "silcutil.h"
 #include "silcconfig.h"
-#include "silctask.h"
 #include "silcschedule.h"
-
-/* SILC core library includes */
-#include "id.h"
-#include "idcache.h"
 #include "silcprotocol.h"
 #include "silcsockconn.h"
+
+/* SILC core library includes */
+#include "silcid.h"
+#include "silcidcache.h"
 #include "silcpayload.h"
 #include "silccommand.h"
 #include "silcchannel.h"
@@ -240,5 +268,8 @@ typedef unsigned char bool;
 #include "payload.h"
 #include "groups.h"
 
-#endif
+/* SILC SFTP library */
+#include "silcsftp.h"
+#include "silcsftp_fs.h"
 
+#endif