X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilcincludes.h;h=ebdea361e518c19f7ca92cc220efbf88c60b6410;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=3e5e1ba64d8720fe7a7bf50bd003a96ad717cb45;hpb=31f388251a7ec018d0945e4955f1520958ae4d0a;p=silc.git diff --git a/includes/silcincludes.h b/includes/silcincludes.h index 3e5e1ba6..ebdea361 100644 --- a/includes/silcincludes.h +++ b/includes/silcincludes.h @@ -2,9 +2,9 @@ silcincludes.h - Author: Pekka Riikonen + Author: Pekka Riikonen - 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 @@ -28,30 +28,71 @@ /* Automatically generated configuration header */ #include "silcdefs.h" +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef WIN32 +#ifndef SILC_WIN32 +#define SILC_WIN32 +#endif +#endif + +#if defined(__EPOC32__) +#ifndef SILC_EPOC +#define SILC_EPOC +#endif +#endif + +#ifdef BEOS +#ifndef SILC_BEOS +#define SILC_BEOS +#endif +#elif defined(__BEOS__) +#ifndef SILC_BEOS +#define SILC_BEOS +#endif +#endif + +#if defined(OS2) +#ifndef SILC_OS2 +#define SILC_OS2 +#endif +#endif + +/* Platform specific includes */ + +#ifdef SILC_WIN32 +#include "silcwin32.h" +#endif + +#ifdef SILC_EPOC +#include "silcepoc.h" +#endif + +#ifdef SILC_BEOS +#include "silcbeos.h" +#endif + +#ifdef SILC_OS2 +#include "silcos2.h" +#endif + +#ifndef DLLAPI +#define DLLAPI +#endif + #include #include -#include #include #include - #include #include #include -#include -#include - -#ifdef SOCKS5 -#include "socks.h" -#endif - -#ifdef HAVE_GETOPT_H -#include -#endif +#include #ifdef HAVE_SIGNAL_H -#undef __USE_GNU #include -#define __USE_GNU 1 #else #error signal.h not found in the system #endif @@ -62,7 +103,7 @@ #error fcntl.h not found in the system #endif -#ifdef HAVE_ASSERT_H +#ifdef HAVE_ERRNO_H #include #else #error errno.h not found in the system @@ -74,6 +115,22 @@ #error assert.h not found in the system #endif +#ifndef SILC_WIN32 + +#include +#include +#include +#include +#include + +#ifdef HAVE_GETOPT_H +#include +#endif + +#ifdef SOCKS5 +#include "socks.h" +#endif + #include #ifdef HAVE_NETINET_IN_H #include @@ -81,10 +138,14 @@ #error netinet/in.h not found in the system #endif +#ifdef HAVE_XTI_H +#include +#else #ifdef HAVE_NETINET_TCP_H #include #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 @@ -107,6 +168,30 @@ #include #endif +#ifdef HAVE_LIMITS_H +#include +#endif + +#ifndef HAVE_REGEX_H +#include "../lib/contrib/regex.h" +#else +#include +#endif + +#ifdef SILC_HAVE_PTHREAD +#include +#endif + +#ifdef HAVE_STDDEF_H +#include +#endif + +#endif /* !SILC_WIN32 */ + +#ifndef HAVE_GETOPT_LONG +#include "../lib/contrib/getopt.h" +#endif + #ifndef TRUE #define TRUE 1 #endif @@ -114,14 +199,74 @@ #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 +#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 +#endif + +#if SILC_SIZEOF_VOID_P < 4 +typedef SilcUInt32 * void *; +#endif + +#ifndef __cplusplus +#ifndef bool +#define bool unsigned char +#endif +#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" @@ -131,27 +276,34 @@ #include "silcpkcs.h" /* SILC util library includes */ +#include "silcmutex.h" +#include "silcthread.h" +#include "silcschedule.h" +#include "silchashtable.h" #include "silclog.h" #include "silcmemory.h" +#include "silclist.h" +#include "silcdlist.h" #include "silcbuffer.h" -#include "silcbufutil.h" #include "silcbuffmt.h" #include "silcnet.h" +#include "silcfileutil.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" -#include "silcpayload.h" + +/* SILC core library includes */ +#include "silcid.h" +#include "silcidcache.h" +#include "silcargument.h" #include "silccommand.h" #include "silcchannel.h" #include "silcpacket.h" #include "silcnotify.h" +#include "silcmode.h" +#include "silcauth.h" +#include "silcprivate.h" #ifdef SILC_SIM /* SILC Module library includes */ @@ -161,8 +313,15 @@ /* 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 */