From 79fa43ce85955f44a4b6fd7b5134743f12c225b0 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 24 Jul 1997 01:49:29 +0000
Subject: Fix memset prototype.

---
 include/asm-mips/string.h | 6 ++++--
 include/linux/string.h    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/asm-mips/string.h b/include/asm-mips/string.h
index 2fb241775..daf1045ed 100644
--- a/include/asm-mips/string.h
+++ b/include/asm-mips/string.h
@@ -5,7 +5,9 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 1994, 1995, 1996 by Ralf Baechle
+ * Copyright (c) 1994, 1995, 1996, 1997 by Ralf Baechle
+ *
+ * $Id: string.h,v 1.2 1997/07/23 14:40:10 ralf Exp $
  */
 #ifndef __ASM_MIPS_STRING_H
 #define __ASM_MIPS_STRING_H
@@ -117,7 +119,7 @@ extern __inline__ int strncmp(__const__ char *__cs, __const__ char *__ct, size_t
 }
 
 #define __HAVE_ARCH_MEMSET
-extern void *memset(void *__s, char __c, size_t __count);
+extern void *memset(void *__s, int __c, size_t __count);
 
 #define __HAVE_ARCH_MEMCPY
 extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
diff --git a/include/linux/string.h b/include/linux/string.h
index 5eb5cc50a..4ec3291c4 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -27,7 +27,7 @@ extern __kernel_size_t strspn(const char *,const char *);
 extern int strcmp(const char *,const char *);
 extern int strncmp(const char *,const char *,__kernel_size_t);
 
-extern void * memset(void *,char,__kernel_size_t);
+extern void * memset(void *,int,__kernel_size_t);
 extern void * memcpy(void *,const void *,__kernel_size_t);
 extern void * memmove(void *,const void *,__kernel_size_t);
 extern void * memscan(void *,int,__kernel_size_t);
-- 
cgit v1.2.3