From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 29 Jun 2001 10:33:45 +0000 (+0000)
Subject: 	updates
X-Git-Tag: 1.2.beta1~2084
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=8789ef86ffbd064ae6bb6ea19e011d007e717806;p=runtime.git

	updates
---

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index ad8ac542..7ea22a48 100644
--- 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 9a0cddd8..dc3cbaec 100644
--- 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 0f6672b8..afe1b281 100644
--- 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 f8321ed1..75b16276 100644
--- 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
  *