X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=includes%2Fsilcwin32.h;h=41af979413ff5efae53f5d38b2e5e5743e751fee;hb=b2474cb7c3ac99b799b99bab950f207d1e2d2dcb;hp=88e103deacf1cc512d5838017cc9ef8e2417807e;hpb=d47a87b03b846e2333ef57b2c0d81f1644992964;p=crypto.git

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index 88e103de..41af9794 100644
--- 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
@@ -25,27 +24,56 @@
 #include <windows.h>
 #include <io.h>
 #include <process.h>
+#include <fcntl.h>
+#include <assert.h>
+
+#if defined(HAVE_SILCDEFS_H)
+#include "regexpr.h"
+#endif /* HAVE_SILCDEFS_H */
 
 #define snprintf _snprintf
 #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
 #define inline __inline
 
 #undef sleep
 #define sleep(x) Sleep((x) * 1000)
 
+#if _MSC_VER < 1300
+#define SetWindowLongPtr SetWindowLong
+#define GetWindowLongPtr GetWindowLong
+#endif /* _MSC_VER < 1300 */
+
 #endif