X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Finclude%2Fkern%2Flibc.h;h=89a166b9b066a6e7ed29c398eb709afd5adffd98;hp=8bca620845ee6dda379682467d554d83f9f6023f;hb=48f0f588f60e735375f4122122b55def1846d8df;hpb=1ac390fe1e18444008857b056c947710be9621a8

diff --git a/kernel/include/kern/libc.h b/kernel/include/kern/libc.h
index 8bca620..89a166b 100644
--- a/kernel/include/kern/libc.h
+++ b/kernel/include/kern/libc.h
@@ -3,16 +3,9 @@
 
 #include <kern/types.h>
 #include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
 
-size_t vsnprintf(char *buf, size_t size, const char *str, va_list args);
-size_t snprintf(char *buf, size_t size, const char *str, ...)
-__attribute__((format(printf, 3, 4)));
-size_t sprintf(char *buf, const char *str, ...)
-__attribute__((format(printf, 2, 3)));
-size_t printf(const char *str, ...)
-__attribute__((format(printf, 1, 2)));
-
-// These are C-ABI so libgcc and libsupc++ can use them.
 extern "C" {
 	// FIXME: template/alignof versions
 	void *memcpy(void *dest, const void *src, size_t len);
@@ -20,12 +13,6 @@ extern "C" {
 	int memcmp(const void *b1, const void *b2, size_t len);
 	void *memset(void *b, int ch, size_t len);
 
-	size_t strnlen(const char *s, size_t n);
-	size_t strlen(const char *s);
-
-	char *strcpy(char *dest, const char *src);
-	char *strncpy(char *dest, const char *src, size_t len);
-
 	void bzero(void *b, size_t len);
 	
 	void *malloc(size_t size);