X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilcincludes.h.in;h=50f98475e774d7534e0d2a0e424410d9ad9b3508;hb=d1e71f42379e8b5cd0748a7aeae8561b02cfe53d;hp=65bf8bdbcf80846fa2017fbf68e8af836dc7c9ab;hpb=413da0f8686910f5e627393157566ae729ca99c4;p=silc.git

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 65bf8bdb..50f98475 100644
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2003 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
@@ -63,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@
@@ -71,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 */
@@ -131,8 +143,12 @@ extern "C" {
 #include <grp.h>
 #include <sys/times.h>
 
-#ifdef HAVE_GETOPT_H
+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
 #include <getopt.h>
+#else
+#if defined(HAVE_SILCDEFS_H)
+#include "getopti.h"
+#endif /* HAVE_SILCDEFS_H */
 #endif
 
 #ifdef SOCKS5
@@ -173,7 +189,9 @@ extern "C" {
 #endif
 
 #ifndef HAVE_REGEX_H
-#include "regex.h"
+#if defined(HAVE_SILCDEFS_H)
+#include "regexpr.h"
+#endif /* HAVE_SILCDEFS_H */
 #else
 #include <regex.h>
 #endif
@@ -206,12 +224,12 @@ extern "C" {
 #include <langinfo.h>
 #endif
 
-#endif				/* !SILC_WIN32 */
-
-#ifndef HAVE_GETOPT_LONG
-#include "getopt.h"
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
 #endif
 
+#endif				/* !SILC_WIN32 */
+
 /* Include generic SILC type definitions */
 #include "silctypes.h"
 #include "silcversion.h"
@@ -231,6 +249,7 @@ extern "C" {
 #include "silchmac.h"
 #include "silcrng.h"
 #include "silcpkcs.h"
+#include "silcpkcs1.h"
 
 /* More SILC util library includes */
 #include "silcmutex.h"
@@ -243,6 +262,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"
@@ -276,9 +297,11 @@ extern "C" {
 #include "silcske_payload.h"
 #include "silcske_groups.h"
 
+#ifdef SILC_DIST_SFTP
 /* SILC SFTP library */
 #include "silcsftp.h"
 #include "silcsftp_fs.h"
+#endif /* SILC_DIST_SFTP */
 
 #ifdef __cplusplus
 }