Merged silc_1_0_branch to trunk.

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

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 34baf790eaf395dd9ccb0bed981a851b376fa4fd..65bf8bdbcf80846fa2017fbf68e8af836dc7c9ab 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -4,13 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2003 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -72,7 +71,7 @@ extern "C" {
 #define SILC_SIZEOF_CHAR @SILC_SIZEOF_CHAR@
 #define SILC_SIZEOF_VOID_P @SILC_SIZEOF_VOID_P@
 
-#if defined(HAVE_SILCDEFS_H)
+#if defined(HAVE_SILCDEFS_H) || defined(SILC_WIN32)
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 #endif /* HAVE_SILCDEFS_H */
@@ -221,6 +220,11 @@ extern "C" {
 #include "silcmp.h"
 #include "silcmath.h"
 
+/* SILC util library includes */
+#include "silcmemory.h"
+#include "silcbuffer.h"
+#include "silcbuffmt.h"
+
 /* Crypto library includes */
 #include "silccipher.h"
 #include "silchash.h"
@@ -228,17 +232,14 @@ extern "C" {
 #include "silcrng.h"
 #include "silcpkcs.h"
 
-/* SILC util library includes */
+/* More SILC util library includes */
 #include "silcmutex.h"
 #include "silcthread.h"
 #include "silcschedule.h"
 #include "silchashtable.h"
 #include "silclog.h"
-#include "silcmemory.h"
 #include "silclist.h"
 #include "silcdlist.h"
-#include "silcbuffer.h"
-#include "silcbuffmt.h"
 #include "silcnet.h"
 #include "silcfileutil.h"
 #include "silcstrutil.h"
@@ -250,17 +251,17 @@ extern "C" {
 #include "silcapputil.h"
 
 /* SILC core library includes */
+#include "silcargument.h"
 #include "silcstatus.h"
 #include "silcid.h"
 #include "silcidcache.h"
-#include "silcargument.h"
 #include "silccommand.h"
+#include "silcmessage.h"
 #include "silcchannel.h"
 #include "silcpacket.h"
 #include "silcnotify.h"
 #include "silcmode.h"
 #include "silcauth.h"
-#include "silcprivate.h"
 #include "silcattrs.h"
 #include "silcvcard.h"