Merged silc_1_0_branch to trunk.

[silc.git] / includes / silcincludes.h.in

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 16bbf4d25889359661cd63c8c18f3da242840bb9..8e57209f31bc93dd0135729fa53c5cc1b71ff83b 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -4,13 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2005 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -64,6 +63,12 @@ extern "C" {
 #endif
 #endif
 
+#if defined(__MACH__) && defined(__APPLE__)
+#ifndef SILC_MACOSX
+#define SILC_MACOSX
+#endif
+#endif
+
 /* Types */
 #define SILC_SIZEOF_LONG_LONG @SILC_SIZEOF_LONG_LONG@
 #define SILC_SIZEOF_LONG @SILC_SIZEOF_LONG@
@@ -72,9 +77,15 @@ extern "C" {
 #define SILC_SIZEOF_CHAR @SILC_SIZEOF_CHAR@
 #define SILC_SIZEOF_VOID_P @SILC_SIZEOF_VOID_P@
 
-#if defined(HAVE_SILCDEFS_H) || defined(SILC_WIN32)
+/* Compilation time defines, for third-party software */
+@__SILC_HAVE_PTHREAD@
+@__SILC_HAVE_SIM@
+@__SILC_ENABLE_DEBUG@
+
+#if defined(HAVE_SILCDEFS_H)
 /* Automatically generated configuration header */
 #include "silcdefs.h"
+#include "silcdistdefs.h"
 #endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
@@ -207,6 +218,10 @@ extern "C" {
 #include <langinfo.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 #endif                         /* !SILC_WIN32 */
 
 #ifndef HAVE_GETOPT_LONG
@@ -232,6 +247,7 @@ extern "C" {
 #include "silchmac.h"
 #include "silcrng.h"
 #include "silcpkcs.h"
+#include "silcpkcs1.h"
 
 /* More SILC util library includes */
 #include "silcmutex.h"
@@ -244,6 +260,8 @@ extern "C" {
 #include "silcnet.h"
 #include "silcfileutil.h"
 #include "silcstrutil.h"
+#include "silcutf8.h"
+#include "silcstringprep.h"
 #include "silcutil.h"
 #include "silcconfig.h"
 #include "silcprotocol.h"
@@ -252,17 +270,17 @@ extern "C" {
 #include "silcapputil.h"
 
 /* SILC core library includes */
+#include "silcargument.h"
 #include "silcstatus.h"
 #include "silcid.h"
 #include "silcidcache.h"
-#include "silcargument.h"
 #include "silccommand.h"
+#include "silcmessage.h"
 #include "silcchannel.h"
 #include "silcpacket.h"
 #include "silcnotify.h"
 #include "silcmode.h"
 #include "silcauth.h"
-#include "silcprivate.h"
 #include "silcattrs.h"
 #include "silcvcard.h"