updates.

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

diff --git a/includes/silc.h.in b/includes/silc.h.in
index fce93cb0ff475170029025065a5e5bbb3c63e4c5..5c3f338b721d2e4527f2c7928f6b9d00c71e1ded 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2006 Pekka Riikonen
+  Copyright (C) 1997 - 2007 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
@@ -70,11 +70,10 @@ extern "C" {
 /* Automatically generated configuration header */
 #ifndef SILC_SYMBIAN
 #include "silcdefs.h"
-#include "silcdistdefs.h"
 #else
 #include "../symbian/silcdefs.h"
-#include "../symbian/silcdistdefs.h"
 #endif /* SILC_SYMBIAN */
+#include "silcdistdefs.h"
 #endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
@@ -91,6 +90,19 @@ extern "C" {
 #define DLLAPI
 #endif
 
+#ifdef SILC_HAVE_PTHREAD
+/* For pthreads rwlock support */
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#else
+#ifdef _XOPEN_SOURCE < 600
+#define _XOPEN_SOURCE_SAVE _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif /* _XOPEN_SOURCE < 600 */
+#endif /* _XOPEN_SOURCE */
+#endif /* SILC_HAVE_PTHREAD */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -182,6 +194,11 @@ 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
@@ -223,6 +240,7 @@ extern "C" {
 /* SILC util library includes */
 #include "silcstack.h"
 #include "silcmemory.h"
+#include "silcsnprintf.h"
 
 /* Math library includes */
 #include "silcmp.h"