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 a00f0dc2103fcc0ed978d7ae043f0322d49dc3ac..fce93cb0ff475170029025065a5e5bbb3c63e4c5 100644
(file)
--- a/
includes/silc.h.in
+++ b/
includes/silc.h.in
@@
-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,7
@@
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"
#include "silcatomic.h"
#include "silcversion.h"
@@
-245,7
+230,6
@@
extern "C" {
/* More SILC util library includes */
#include "silctime.h"
/* More SILC util library includes */
#include "silctime.h"
-#include "silcmutex.h"
#include "silccond.h"
#include "silcthread.h"
#include "silcschedule.h"
#include "silccond.h"
#include "silcthread.h"
#include "silcschedule.h"
@@
-291,12
+275,12
@@
extern "C" {
#include "silcstatus.h"
#include "silcid.h"
#include "silccommand.h"
#include "silcstatus.h"
#include "silcid.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 "silcpubkey.h"
#include "silcattrs.h"
#include "silcpubkey.h"