updates

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index ad8ac5426784b611da0510989ed893e7535248c7..7ea22a48a8e9600aa596b357c85b6b47fe2818e3 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -34,13 +34,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <time.h>
 
 #ifdef HAVE_SIGNAL_H
@@ -69,6 +67,8 @@
 
 #ifndef SILC_WIN32
 
+#include <unistd.h>
+#include <sys/time.h>
 #include <pwd.h>
 #include <grp.h>
 #include <sys/times.h>

diff --git a/includes/silcwin32.h b/includes/silcwin32.h
index 9a0cddd8b2bcd1d58a3216a726c2c2d1dbbd73fa..dc3cbaec1f58b7f31a368fd429f2abf2a6e1b67e 100644 (file)
--- a/includes/silcwin32.h
+++ b/includes/silcwin32.h
@@ -23,7 +23,6 @@
 #define SILCWIN32_H
 
 #include <windows.h>
-#include <dir.h>
 #include <io.h>
 
 #define snprintf _snprintf

diff --git a/lib/silcutil/silcsockconn.c b/lib/silcutil/silcsockconn.c
index 0f6672b8783ae8fe83c10f2b2c1b9e92347d9bab..afe1b2811263fbdc16f1c23efaf1a505ef853ed4 100644 (file)
--- a/lib/silcutil/silcsockconn.c
+++ b/lib/silcutil/silcsockconn.c
@@ -22,7 +22,7 @@
 #include "silcincludes.h"
 
 /* Heartbeat context */
-struct SilcSocketConnectionHB {
+struct SilcSocketConnectionHBStruct {
   uint32 heartbeat;
   SilcSocketConnectionHBCb hb_callback;
   void *hb_context;

diff --git a/lib/silcutil/silcsockconn.h b/lib/silcutil/silcsockconn.h
index f8321ed1fc2da628c956dd73409948053a670434..75b1627608b26a94548f612dae84a888b50a9980 100644 (file)
--- a/lib/silcutil/silcsockconn.h
+++ b/lib/silcutil/silcsockconn.h
@@ -65,7 +65,7 @@ typedef struct SilcSocketConnectionStruct *SilcSocketConnection;
  *    interface routines.
  *
  ***/
-typedef struct SilcSocketConnectionHB *SilcSocketConnectionHB;
+typedef struct SilcSocketConnectionHBStruct *SilcSocketConnectionHB;
 
 /****d* silcutil/SilcSocketConnectionAPI/SilcSocketType
  *