updates.

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

diff --git a/includes/silc.h.in b/includes/silc.h.in
index 85810c1d327f3726f5741f8192d4ba8b7f5587dc..5c63c403116d860844dfbb4789d322b76ccbbdd3 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -90,19 +90,6 @@ extern "C" {
 #define DLLAPI
 #endif
 
-#ifdef SILC_HAVE_PTHREAD
-/* For pthreads rwlock support */
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
-#else
-#ifdef _XOPEN_SOURCE < 500
-#define _XOPEN_SOURCE_SAVE _XOPEN_SOURCE
-#undef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
-#endif /* _XOPEN_SOURCE < 500 */
-#endif /* _XOPEN_SOURCE */
-#endif /* SILC_HAVE_PTHREAD */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -194,11 +181,6 @@ extern "C" {
 
 #ifdef SILC_HAVE_PTHREAD
 #include <pthread.h>
-#ifdef _XOPEN_SOURCE_SAVE
-#undef _XOPEN_SOURCE
-#define _XOPEN_SOURCE _XOPEN_SOURCE_SAVE
-#undef _XOPEN_SOURCE_SAVE
-#endif /* _XOPEN_SOURCE_SAVE */
 #endif
 
 #ifdef HAVE_STDDEF_H
@@ -238,6 +220,7 @@ extern "C" {
 #include "silcversion.h"
 
 /* SILC util library includes */
+#include "silclist.h"
 #include "silcstack.h"
 #include "silcmemory.h"
 #include "silcsnprintf.h"
@@ -254,8 +237,10 @@ extern "C" {
 #include "silclog.h"
 #include "silcbuffer.h"
 #include "silcbuffmt.h"
+#include "silcasync.h"
 
 /* Crypto library includes */
+#include "silccrypto.h"
 #include "silccipher.h"
 #include "silchash.h"
 #include "silchmac.h"
@@ -265,13 +250,14 @@ extern "C" {
 #include "silcpkcs1.h"
 
 /* More SILC util library includes */
+#include "silcenv.h"
+#include "silcdll.h"
 #include "silchashtable.h"
-#include "silclist.h"
 #include "silcdlist.h"
-#include "silcasync.h"
 #include "silcstream.h"
 #include "silcnet.h"
 #include "silcfileutil.h"
+#include "silcbase64.h"
 #include "silcstrutil.h"
 #include "silcutf8.h"
 #include "silcstringprep.h"