X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flib%2Fstdio.h;h=8288ff04ac8b18c677eb0ee58a0267691654e04c;hb=615bf3b3d2a8573ed6fb9ddc0055745e163ac999;hp=31be6d8353df7df90e3bde34c6860d1c6c24ad1b;hpb=5780c9f434cca090f88463b7f0199d49b4ded288;p=pintos-anon

diff --git a/src/lib/stdio.h b/src/lib/stdio.h
index 31be6d8..8288ff0 100644
--- a/src/lib/stdio.h
+++ b/src/lib/stdio.h
@@ -7,6 +7,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+/* Include lib/user/stdio.h or lib/kernel/stdio.h, as
+   appropriate. */
+#include_next <stdio.h>
+
 /* Predefined file handles. */
 #define STDIN_FILENO 0
 #define STDOUT_FILENO 1
@@ -20,13 +24,6 @@ int putchar (int);
 int puts (const char *);
 
 /* Nonstandard functions. */
-#ifdef KERNEL
-void putbuf (const char *, size_t);
-#endif
-#ifdef USER
-int hprintf (int, const char *, ...) PRINTF_FORMAT (2, 3);
-int vhprintf (int, const char *, va_list) PRINTF_FORMAT (2, 0);
-#endif
 void hex_dump (uintptr_t ofs, const void *, size_t size, bool ascii);
 
 /* Internal functions. */