Merged silc_1_0_branch to trunk.

[silc.git] / includes / silcwin32.h

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index 88e103deacf1cc512d5838017cc9ef8e2417807e..92eb37e33d993c2f816a7d6d9f7eca526899c20c 100644 (file)
--- a/includes/silcwin32.h
+++ b/includes/silcwin32.h
@@ -4,13 +4,13 @@
 
   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.
-  
+
   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
@@ -30,16 +30,34 @@
 #define vsnprintf _vsnprintf
 
 #ifdef WIN32
-#define strcasecmp strcmp
+#define strcasecmp stricmp
 #define strncasecmp strncmp
 #endif
 
 #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 */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x400
+#else
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x400
+#endif /* _WIN32_WINNT */
+#if !defined(SO_SYNCHRONOUS_NONALERT)
+#define SO_SYNCHRONOUS_NONALERT 0x20
 #endif
+#if !defined(SO_OPENTYPE)
+#define SO_OPENTYPE 0x7008
 #endif
 
 #undef inline