aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2002-08-12 22:48:08 +0000
committerH. Peter Anvin <hpa@zytor.com>2002-08-12 22:48:08 +0000
commit1230090a12146333c8b362e3ba66eeb4a484cebf (patch)
tree8a8c6020d65e49462763c14680d66439ad8bd506
parent4631d7357fdffd744808959f4505c730dc978bab (diff)
downloadklibc-1230090a12146333c8b362e3ba66eeb4a484cebf.tar.gz
Correct memcmp(), <sys/resource.h>klibc-0.24
-rw-r--r--include/sys/resource.h3
-rw-r--r--klibc/Makefile2
-rw-r--r--klibc/include/sys/resource.h3
-rw-r--r--klibc/memcmp.c2
-rw-r--r--memcmp.c2
5 files changed, 7 insertions, 5 deletions
diff --git a/include/sys/resource.h b/include/sys/resource.h
index 7cb11f2c052de..ef14bde9f6286 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -5,7 +5,8 @@
#ifndef _SYS_RESOURCE_H
#define _SYS_RESOURCE_H
-#include <sys/types.h> /* MUST be included first! */
+#include <klibc/extern.h>
+#include <sys/types.h> /* MUST be included before linux/resource.h */
#include <linux/resource.h>
__extern int getpriority(int, int);
diff --git a/klibc/Makefile b/klibc/Makefile
index 27d0fbc8b8898..873d12df5609b 100644
--- a/klibc/Makefile
+++ b/klibc/Makefile
@@ -29,7 +29,7 @@ LIBOBJS = vsnprintf.o snprintf.o vsprintf.o sprintf.o \
sleep.o usleep.o raise.o abort.o assert.o alarm.o pause.o \
signal.o sigaction.o sigpending.o sigprocmask.o sigsuspend.o \
brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o \
- memcpy.o memset.o memccpy.o memmem.o strcat.o strchr.o \
+ memcpy.o memcmp.o memset.o memccpy.o memmem.o strcat.o strchr.o \
strcmp.o strcpy.o strdup.o strlen.o strncat.o strstr.o \
strncmp.o strncpy.o strrchr.o strspn.o strsep.o strtok.o \
gethostname.o getdomainname.o getcwd.o seteuid.o setegid.o \
diff --git a/klibc/include/sys/resource.h b/klibc/include/sys/resource.h
index 7cb11f2c052de..ef14bde9f6286 100644
--- a/klibc/include/sys/resource.h
+++ b/klibc/include/sys/resource.h
@@ -5,7 +5,8 @@
#ifndef _SYS_RESOURCE_H
#define _SYS_RESOURCE_H
-#include <sys/types.h> /* MUST be included first! */
+#include <klibc/extern.h>
+#include <sys/types.h> /* MUST be included before linux/resource.h */
#include <linux/resource.h>
__extern int getpriority(int, int);
diff --git a/klibc/memcmp.c b/klibc/memcmp.c
index ff300160ba05a..9dda5a45588bf 100644
--- a/klibc/memcmp.c
+++ b/klibc/memcmp.c
@@ -2,7 +2,7 @@
* memcmp.c
*/
-#include <memcmp.h>
+#include <string.h>
int memcmp(const void *s1, const void *s2, size_t n)
{
diff --git a/memcmp.c b/memcmp.c
index ff300160ba05a..9dda5a45588bf 100644
--- a/memcmp.c
+++ b/memcmp.c
@@ -2,7 +2,7 @@
* memcmp.c
*/
-#include <memcmp.h>
+#include <string.h>
int memcmp(const void *s1, const void *s2, size_t n)
{