summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-07-24 01:49:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-07-24 01:49:29 +0000
commit79fa43ce85955f44a4b6fd7b5134743f12c225b0 (patch)
treec1aed2934b97f890e8883398a75e30ea6c29b6af /include
parente3135e236980d3aeb2aa231600865764dc1a0d33 (diff)
Fix memset prototype.
Diffstat (limited to 'include')
-rw-r--r--include/asm-mips/string.h6
-rw-r--r--include/linux/string.h2
2 files changed, 5 insertions, 3 deletions
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);