projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
includes
/
silcincludes.h
diff --git
a/includes/silcincludes.h
b/includes/silcincludes.h
index 4ce05d26e2f11b8827b4f6962d4d5b4c2e238b12..ebdea361e518c19f7ca92cc220efbf88c60b6410 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-28,16
+28,60
@@
/* Automatically generated configuration header */
#include "silcdefs.h"
/* Automatically generated configuration header */
#include "silcdefs.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef WIN32
#ifndef SILC_WIN32
#define SILC_WIN32
#endif
#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_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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-94,10
+138,14
@@
#error netinet/in.h not found in the system
#endif
#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
#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
#endif
#ifdef HAVE_NETDB_H
@@
-134,6
+182,10
@@
#include <pthread.h>
#endif
#include <pthread.h>
#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
#endif /* !SILC_WIN32 */
#ifndef HAVE_GETOPT_LONG
@@
-147,61
+199,67
@@
#define FALSE 0
#endif
#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 */
/* 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;
+
+typedef unsigned char SilcUInt8;
+typedef signed char SilcInt8;
#if SILC_SIZEOF_SHORT > 2
#error "size of the short must be 2 bytes"
#endif
#if SILC_SIZEOF_SHORT > 2
#error "size of the short must be 2 bytes"
#endif
-typedef unsigned short
ui
nt16;
-typedef signed short
i
nt16;
+typedef unsigned short
SilcUI
nt16;
+typedef signed short
SilcI
nt16;
#if SILC_SIZEOF_LONG == 4
#if SILC_SIZEOF_LONG == 4
-typedef unsigned long
ui
nt32;
-typedef signed long
i
nt32;
+typedef unsigned long
SilcUI
nt32;
+typedef signed long
SilcI
nt32;
#else
#if SILC_SIZEOF_INT == 4
#else
#if SILC_SIZEOF_INT == 4
-typedef unsigned
long ui
nt32;
-typedef signed
long i
nt32;
+typedef unsigned
int SilcUI
nt32;
+typedef signed
int SilcI
nt32;
#else
#if SILC_SIZEOF_LONG_LONG >= 4
#else
#if SILC_SIZEOF_LONG_LONG >= 4
-typedef unsigned long long uint32;
-typedef signed long long int32;
+#ifndef WIN32
+typedef unsigned long long SilcUInt32;
+typedef signed long long SilcInt32;
+#endif
#endif
#endif
#endif
#if SILC_SIZEOF_LONG >= 8
#endif
#endif
#endif
#if SILC_SIZEOF_LONG >= 8
-typedef unsigned long
ui
nt64;
-typedef signed long
i
nt64;
+typedef unsigned long
SilcUI
nt64;
+typedef signed long
SilcI
nt64;
#else
#if SILC_SIZEOF_LONG_LONG >= 8
#else
#if SILC_SIZEOF_LONG_LONG >= 8
-typedef unsigned long long uint64;
-typedef signed long long int64;
+#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
#else
-typedef
uint32 ui
nt64;
-typedef
int32 i
nt64;
+typedef
SilcUInt32 SilcUI
nt64;
+typedef
SilcInt32 SilcI
nt64;
#endif
#endif
#if SILC_SIZEOF_VOID_P < 4
#endif
#endif
#if SILC_SIZEOF_VOID_P < 4
-typedef
ui
nt32 * void *;
+typedef
SilcUI
nt32 * void *;
#endif
#endif
+#ifndef __cplusplus
#ifndef bool
#define bool unsigned char
#endif
#ifndef bool
#define bool unsigned char
#endif
+#endif
/* Generic global SILC includes */
#include "bitmove.h"
/* Generic global SILC includes */
#include "bitmove.h"
@@
-220,24
+278,25
@@
typedef uint32 * void *;
/* SILC util library includes */
#include "silcmutex.h"
#include "silcthread.h"
/* SILC util library includes */
#include "silcmutex.h"
#include "silcthread.h"
+#include "silcschedule.h"
#include "silchashtable.h"
#include "silclog.h"
#include "silcmemory.h"
#include "silchashtable.h"
#include "silclog.h"
#include "silcmemory.h"
+#include "silclist.h"
+#include "silcdlist.h"
#include "silcbuffer.h"
#include "silcbuffer.h"
-#include "silcbufutil.h"
#include "silcbuffmt.h"
#include "silcnet.h"
#include "silcbuffmt.h"
#include "silcnet.h"
+#include "silcfileutil.h"
#include "silcutil.h"
#include "silcconfig.h"
#include "silcutil.h"
#include "silcconfig.h"
-#include "silc
task
.h"
-#include "silcs
chedule
.h"
+#include "silc
protocol
.h"
+#include "silcs
ockconn
.h"
/* SILC core library includes */
#include "silcid.h"
#include "silcidcache.h"
/* SILC core library includes */
#include "silcid.h"
#include "silcidcache.h"
-#include "silcprotocol.h"
-#include "silcsockconn.h"
-#include "silcpayload.h"
+#include "silcargument.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
#include "silccommand.h"
#include "silcchannel.h"
#include "silcpacket.h"
@@
-246,10
+305,6
@@
typedef uint32 * void *;
#include "silcauth.h"
#include "silcprivate.h"
#include "silcauth.h"
#include "silcprivate.h"
-/* TRQ (SilcList API and SilcDList API) */
-#include "silclist.h"
-#include "silcdlist.h"
-
#ifdef SILC_SIM
/* SILC Module library includes */
#include "silcsim.h"
#ifdef SILC_SIM
/* SILC Module library includes */
#include "silcsim.h"
@@
-258,8
+313,15
@@
typedef uint32 * void *;
/* SILC Key Exchange library includes */
#include "silcske.h"
/* 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
+#endif /* SILCINCLUDES_H */