projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added preliminary Symbian support.
[silc.git]
/
includes
/
silc.h.in
diff --git
a/includes/silc.h.in
b/includes/silc.h.in
index b85fd024aad5112307b936af7f16cebe7d2e32fd..fce93cb0ff475170029025065a5e5bbb3c63e4c5 100644
(file)
--- a/
includes/silc.h.in
+++ b/
includes/silc.h.in
@@
-4,7
+4,7
@@
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 200
5
Pekka Riikonen
+ Copyright (C) 1997 - 200
6
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
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
@@
-37,35
+37,19
@@
extern "C" {
#endif
#endif
#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
+#if defined(__EPOC32__) || defined(__SYMBIAN32__)
+#ifndef SILC_SYMBIAN
+#define SILC_SYMBIAN
#undef SILC_UNIX
#undef SILC_UNIX
+#undef SILC_WIN32
#endif
#endif
#if defined(__MACH__) && defined(__APPLE__)
#ifndef SILC_MACOSX
#define SILC_MACOSX
#endif
#endif
#if defined(__MACH__) && defined(__APPLE__)
#ifndef SILC_MACOSX
#define SILC_MACOSX
+#undef SILC_WIN32
+#undef SILC_SYMBIAN
#endif
#endif
#endif
#endif
@@
-84,8
+68,13
@@
extern "C" {
#if defined(HAVE_SILCDEFS_H)
/* Automatically generated configuration header */
#if defined(HAVE_SILCDEFS_H)
/* Automatically generated configuration header */
+#ifndef SILC_SYMBIAN
#include "silcdefs.h"
#include "silcdistdefs.h"
#include "silcdefs.h"
#include "silcdistdefs.h"
+#else
+#include "../symbian/silcdefs.h"
+#include "../symbian/silcdistdefs.h"
+#endif /* SILC_SYMBIAN */
#endif /* HAVE_SILCDEFS_H */
/* Platform specific includes */
#endif /* HAVE_SILCDEFS_H */
/* Platform specific includes */
@@
-94,16
+83,8
@@
extern "C" {
#include "silcwin32.h"
#endif
#include "silcwin32.h"
#endif
-#if defined(SILC_EPOC)
-#include "silcepoc.h"
-#endif
-
-#if defined(SILC_BEOS)
-#include "silcbeos.h"
-#endif
-
-#if defined(SILC_OS2)
-#include "silcos2.h"
+#if defined(SILC_SYMBIAN)
+#include "silcsymbian.h"
#endif
#ifndef DLLAPI
#endif
#ifndef DLLAPI
@@
-140,9
+121,12
@@
extern "C" {
#include <unistd.h>
#include <sys/time.h>
#include <pwd.h>
#include <unistd.h>
#include <sys/time.h>
#include <pwd.h>
-#include <grp.h>
#include <sys/times.h>
#include <sys/times.h>
+#ifdef HAVE_GRP_H
+#include <grp.h>
+#endif
+
#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
#include <getopt.h>
#else
#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
#include <getopt.h>
#else
@@
-232,6
+216,8
@@
extern "C" {
/* Include generic SILC type definitions */
#include "silctypes.h"
/* Include generic SILC type definitions */
#include "silctypes.h"
+#include "silcmutex.h"
+#include "silcatomic.h"
#include "silcversion.h"
/* SILC util library includes */
#include "silcversion.h"
/* SILC util library includes */
@@
-243,6
+229,11
@@
extern "C" {
#include "silcmath.h"
/* More SILC util library includes */
#include "silcmath.h"
/* More SILC util library includes */
+#include "silctime.h"
+#include "silccond.h"
+#include "silcthread.h"
+#include "silcschedule.h"
+#include "silclog.h"
#include "silcbuffer.h"
#include "silcbuffmt.h"
#include "silcbuffer.h"
#include "silcbuffmt.h"
@@
-252,15
+243,11
@@
extern "C" {
#include "silchmac.h"
#include "silcrng.h"
#include "silcpkcs.h"
#include "silchmac.h"
#include "silcrng.h"
#include "silcpkcs.h"
+#include "silcpk.h"
#include "silcpkcs1.h"
/* More SILC util library includes */
#include "silcpkcs1.h"
/* More SILC util library includes */
-#include "silctime.h"
-#include "silcmutex.h"
-#include "silcthread.h"
-#include "silcschedule.h"
#include "silchashtable.h"
#include "silchashtable.h"
-#include "silclog.h"
#include "silclist.h"
#include "silcdlist.h"
#include "silcasync.h"
#include "silclist.h"
#include "silcdlist.h"
#include "silcasync.h"
@@
-276,7
+263,6
@@
extern "C" {
#include "silcsocketstream.h"
#include "silcfdstream.h"
#include "silcvcard.h"
#include "silcsocketstream.h"
#include "silcfdstream.h"
#include "silcvcard.h"
-#include "silcapputil.h"
#include "silcmime.h"
#ifdef SILC_DIST_ASN1
#include "silcmime.h"
#ifdef SILC_DIST_ASN1
@@
-288,15
+274,21
@@
extern "C" {
#include "silcargument.h"
#include "silcstatus.h"
#include "silcid.h"
#include "silcargument.h"
#include "silcstatus.h"
#include "silcid.h"
-#include "silcidcache.h"
#include "silccommand.h"
#include "silccommand.h"
+#include "silcauth.h"
#include "silcmessage.h"
#include "silcchannel.h"
#include "silcpacket.h"
#include "silcnotify.h"
#include "silcmode.h"
#include "silcmessage.h"
#include "silcchannel.h"
#include "silcpacket.h"
#include "silcnotify.h"
#include "silcmode.h"
-#include "silcauth.h"
#include "silcattrs.h"
#include "silcattrs.h"
+#include "silcpubkey.h"
+
+/* Application utility includes */
+#include "silcapputil.h"
+#ifdef SILC_DIST_IDCACHE
+#include "silcidcache.h"
+#endif /* SILC_DIST_IDCACHE */
#ifdef SILC_DIST_SKR
#include "silcskr.h"
#ifdef SILC_DIST_SKR
#include "silcskr.h"
@@
-320,6
+312,12
@@
extern "C" {
#include "silcsftp_fs.h"
#endif /* SILC_DIST_SFTP */
#include "silcsftp_fs.h"
#endif /* SILC_DIST_SFTP */
+#ifdef SILC_DIST_HTTP
+/* SILC HTTP library */
+#include "silchttpserver.h"
+#include "silchttpphp.h"
+#endif /* SILC_DIST_HTTP */
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif