X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilc.h.in;h=8ef23141d5824e57248c277da9e9b868e0621abb;hb=562927f2871fedc49ec9e3e7e74bf93cbcafb71e;hp=a5773c297f78b60f26284ecda9d81fc064152e9e;hpb=182f1698206a2227616be30691591eea1274cd2b;p=silc.git

diff --git a/includes/silc.h.in b/includes/silc.h.in
index a5773c29..8ef23141 100644
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -67,6 +67,7 @@ extern "C" {
 @__SILC_ENABLE_DEBUG@
 
 #if defined(HAVE_SILCDEFS_H)
+
 /* Automatically generated configuration header */
 #ifndef SILC_SYMBIAN
 #include "silcdefs.h"
@@ -74,6 +75,37 @@ extern "C" {
 #include "../symbian/silcdefs.h"
 #endif /* SILC_SYMBIAN */
 #include "silcdistdefs.h"
+
+#else
+
+/* Autodetect CPU so that inline assembly in headers are enabled */
+
+#if defined(__i386__)
+#undef SILC_I386
+#define SILC_I386
+#undef SILC_I486
+#define SILC_I486
+#endif /* __i386__ */
+
+#if defined(__x86_64__)
+#undef SILC_X86_64
+#define SILC_X86_64
+#endif /* __x86_64__ */
+
+#if defined(__ia64__)
+#undef SILC_IA64
+#define SILC_IA64
+#endif /* __ia64__ */
+
+#if defined(__ppc__) || defined(__ppc64__)
+#undef SILC_POWERPC
+#define SILC_POWERPC
+#endif /* __ppc__ || __ppc64__ */
+
+#ifndef SILC_ALIGNMENT
+#define SILC_ALIGNMENT SILC_SIZEOF_VOID_P
+#endif /* SILC_ALIGNMENT */
+
 #endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
@@ -214,12 +246,15 @@ extern "C" {
 #endif				/* !SILC_WIN32 */
 
 /* Include generic SILC type definitions */
+#include "silcerrno.h"
 #include "silctypes.h"
+#include "silcbitops.h"
 #include "silcmutex.h"
 #include "silcatomic.h"
 #include "silcversion.h"
 
 /* SILC util library includes */
+#include "silcgetopt.h"
 #include "silclist.h"
 #include "silcstack.h"
 #include "silcmemory.h"
@@ -250,7 +285,12 @@ extern "C" {
 #include "silcpkcs.h"
 #include "silcpk.h"
 #include "silcpkcs1.h"
+#ifdef SILC_DIST_ACC
 #include "silcacc.h"
+#endif /* SILC_DIST_ACC */
+#ifdef SILC_DIST_SSH
+#include "silcssh.h"
+#endif /* SILC_DIST_SSH */
 
 /* More SILC util library includes */
 #include "silcenv.h"
@@ -268,9 +308,12 @@ extern "C" {
 #include "silcfsm.h"
 #include "silcsocketstream.h"
 #include "silcfdstream.h"
-#include "silcvcard.h"
 #include "silcmime.h"
 
+#ifdef SILC_DIST_VCARD
+#include "silcvcard.h"
+#endif /* SILC_DIST_VCARD */
+
 #ifdef SILC_DIST_ASN1
 #include "silcasn1.h"
 #include "silcber.h"