updates.

[silc.git] / includes / silcincludes.h

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 060a357e95619f88c57f5bc90be39fb6a6a92808..ee0dfcfb670efb7d1438ee89ba9a2a37d12e433e 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -64,24 +64,26 @@ extern "C" {
 #endif
 #endif
 
+#if defined(HAVE_SILCDEFS_H)
 /* Automatically generated configuration header */
 #include "silcdefs.h"
+#endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
 
-#ifdef SILC_WIN32
+#if defined(SILC_WIN32)
 #include "silcwin32.h"
 #endif
 
-#ifdef SILC_EPOC
+#if defined(SILC_EPOC)
 #include "silcepoc.h"
 #endif
 
-#ifdef SILC_BEOS
+#if defined(SILC_BEOS)
 #include "silcbeos.h"
 #endif
 
-#ifdef SILC_OS2
+#if defined(SILC_OS2)
 #include "silcos2.h"
 #endif
 
@@ -100,29 +102,21 @@ extern "C" {
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
-#else
-#error signal.h not found in the system
 #endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
-#error fcntl.h not found in the system
 #endif
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
-#else
-#error errno.h not found in the system
 #endif
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
-#else
-#error assert.h not found in the system
 #endif
 
-#ifndef SILC_WIN32
+#if !defined(SILC_WIN32)
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -141,8 +135,6 @@ extern "C" {
 #include <sys/socket.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
-#else
-#error netinet/in.h not found in the system
 #endif
 
 #ifdef HAVE_XTI_H
@@ -150,21 +142,15 @@ extern "C" {
 #else
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
-#else
-#error xti.h nor even netinet/tcp.h found in the system
 #endif
 #endif
 
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
-#else
-#error netdb.h not found in the system
 #endif
 
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#else
-#error arpa/inet.h not found in the system
 #endif
 
 #ifdef HAVE_SYS_MMAN_H
@@ -253,6 +239,7 @@ extern "C" {
 #include "silcprotocol.h"
 #include "silcsockconn.h"
 #include "silcvcard.h"
+#include "silcapputil.h"
 
 /* SILC core library includes */
 #include "silcstatus.h"
@@ -268,9 +255,8 @@ extern "C" {
 #include "silcprivate.h"
 #include "silcattrs.h"
 #include "silcvcard.h"
-#include "silcapputil.h"
 
-#ifdef SILC_SIM
+#if defined(SILC_SIM)
 /* SILC Module library includes */
 #include "silcsim.h"
 #include "silcsimutil.h"