Merged silc_1_0_branch to trunk.

[silc.git] / includes / silcwin32.h

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index e670a75f96950223a118987606e93e7d1abab982..cd9420096305bd015d22e29fbb26b2f0281cf29f 100644 (file)
--- a/includes/silcwin32.h
+++ b/includes/silcwin32.h
@@ -4,13 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 Pekka Riikonen
+  Copyright (C) 2001 - 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
@@ -36,13 +35,17 @@
 
 #ifdef WIN32
 #ifndef DLL
+#ifndef _LIB
 #define DLLAPI __declspec(dllimport)
 #else
-#define DLLAPI // Nada, we use .DEF
+#define DLLAPI /* Nada, we use .DEF */
+#endif
+#else
+#define DLLAPI /* Nada, we use .DEF */
 #endif
 #endif
 
-# Some winsock compatiblity requirements
+/* Some winsock compatiblity requirements */
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
 #else