From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 29 Jun 2001 11:22:31 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: 1.2.beta1~2083
X-Git-Url: http://git.silc.fi/gitweb/?a=commitdiff_plain;h=11a6a52e59e619c2ceff13a441d40c608872777a;p=runtime.git

	updates.
---

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 7ea22a48..1c4ef761 100644
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -28,6 +28,12 @@
 /* Automatically generated configuration header */
 #include "silcdefs.h"
 
+#ifdef WIN32
+#ifndef SILC_WIN32
+#define SILC_WIN32
+#endif
+#endif
+
 #ifdef SILC_WIN32
 #include "silcwin32.h"
 #endif
diff --git a/lib/silcutil/silcbuffer.h b/lib/silcutil/silcbuffer.h
index 12491103..34e30c1c 100644
--- a/lib/silcutil/silcbuffer.h
+++ b/lib/silcutil/silcbuffer.h
@@ -136,10 +136,10 @@ SilcBuffer silc_buffer_alloc(uint32 len)
   SilcBuffer sb;
 
   /* Allocate new SilcBuffer */
-  sb = silc_calloc(1, sizeof(*sb));
+  sb = (SilcBuffer)silc_calloc(1, sizeof(*sb));
 
   /* Allocate the actual data area */
-  sb->head = silc_calloc(len, sizeof(*sb->head));
+  sb->head = (unsigned char *)silc_calloc(len, sizeof(*sb->head));
 
   /* Set pointers to the new buffer */
   sb->truelen = len;
@@ -309,7 +309,7 @@ unsigned char *silc_buffer_put_head(SilcBuffer sb,
 #ifdef SILC_DEBUG
   assert((sb->data - sb->head) >= len);
 #endif
-  return memcpy(sb->head, data, len);
+  return (unsigned char *)memcpy(sb->head, data, len);
 }
 
 /* Puts data at the start of the valid data area. Returns a pointer 
@@ -331,7 +331,7 @@ unsigned char *silc_buffer_put(SilcBuffer sb,
 #ifdef SILC_DEBUG
   assert((sb->tail - sb->data) >= len);
 #endif
-  return memcpy(sb->data, data, len);
+  return (unsigned char *)memcpy(sb->data, data, len);
 }
 
 /* Puts data at the tail of the buffer. Returns pointer to the copied
@@ -353,7 +353,7 @@ unsigned char *silc_buffer_put_tail(SilcBuffer sb,
 #ifdef SILC_DEBUG
   assert((sb->end - sb->tail) >= len);
 #endif
-  return memcpy(sb->tail, data, len);
+  return (unsigned char *)memcpy(sb->tail, data, len);
 }
 
 #endif
diff --git a/lib/silcutil/silctask.h b/lib/silcutil/silctask.h
index 9cd4547e..744c2f8d 100644
--- a/lib/silcutil/silctask.h
+++ b/lib/silcutil/silctask.h
@@ -235,12 +235,12 @@ static void func(void *qptr, int type, void *context, int fd)
 void func(void *qptr, int type, void *context, int fd)
 
 /* Prototypes */
-void silc_task_queue_alloc(SilcSchedule schedule, SilcTaskQueue *new, 
+void silc_task_queue_alloc(SilcSchedule schedule, SilcTaskQueue *queue, 
 			   bool valid);
 void silc_task_queue_free(SilcTaskQueue queue);
-SilcTask silc_task_add(SilcTaskQueue queue, SilcTask new, 
+SilcTask silc_task_add(SilcTaskQueue queue, SilcTask task, 
 		       SilcTaskPriority priority);
-SilcTask silc_task_add_timeout(SilcTaskQueue queue, SilcTask new,
+SilcTask silc_task_add_timeout(SilcTaskQueue queue, SilcTask task,
 			       SilcTaskPriority priority);
 SilcTask silc_task_register(SilcTaskQueue queue, int fd, 
 			    SilcTaskCallback cb, void *context,