Redo makefiles.

[pintos-anon] / src / lib / lib.c

diff --git a/src/lib/lib.c b/src/lib/lib.c
index 46f7f2669071cfb8936d0321993353dea8157ae1..91fb318f2c8ebaf5898019c32f1b802e1d429147 100644 (file)
--- a/src/lib/lib.c
+++ b/src/lib/lib.c
@@ -1,12 +1,12 @@
+#include "lib.h"
 #include <stdint.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include "debug.h"
-#include "interrupt.h"
-#include "lib.h"
-#include "serial.h"
-#include "vga.h"
+#include "devices/serial.h"
+#include "devices/vga.h"
+#include "threads/interrupt.h"
 
 static void
 vprintf_core (const char *format, va_list args,
@@ -469,8 +469,8 @@ struct integer_base
 
 static const struct integer_base base_d = {10, "0123456789", "", 3};
 static const struct integer_base base_o = {8, "01234567", "0", 3};
-static const struct integer_base base_x = {16, "0123456789acbdef", "", 4};
-static const struct integer_base base_X = {16, "0123456789ABCDEF", "", 4};
+static const struct integer_base base_x = {16, "0123456789abcdef", "0x", 4};
+static const struct integer_base base_X = {16, "0123456789ABCDEF", "0X", 4};
 
 static const char *parse_conversion (const char *format,
                                      struct printf_conversion *,