updates.

[silc.git] / includes / silcwin32.h

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index e670a75f96950223a118987606e93e7d1abab982..41af979413ff5efae53f5d38b2e5e5743e751fee 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
@@ -25,6 +24,12 @@
 #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
@@ -36,13 +41,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
@@ -62,4 +71,9 @@
 #undef sleep
 #define sleep(x) Sleep((x) * 1000)
 
+#if _MSC_VER < 1300
+#define SetWindowLongPtr SetWindowLong
+#define GetWindowLongPtr GetWindowLong
+#endif /* _MSC_VER < 1300 */
+
 #endif