summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--console/ChangeLog8
-rw-r--r--console/Makefile2
-rw-r--r--console/console.c2
-rw-r--r--console/display-drv.h (renamed from console/display.h)0
-rw-r--r--console/vga-display.c2
5 files changed, 11 insertions, 3 deletions
diff --git a/console/ChangeLog b/console/ChangeLog
index 2922e5d7..5b228dd6 100644
--- a/console/ChangeLog
+++ b/console/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-04 Marcus Brinkmann <marcus@gnu.org>
+
+ * display.h: Renamed to ...
+ * display-drv.h: ... this.
+ * Makefile (LCLHDRS): Rename display.h to display-drv.h.
+ * console.c: Include "display-drv.h" instead "display.h".
+ * vga-display.c: Likewise.
+
2002-06-03 Marcus Brinkmann <marcus@gnu.org>
* console.c (vcons_release): Fix last change.
diff --git a/console/Makefile b/console/Makefile
index b44c583d..06ceec4e 100644
--- a/console/Makefile
+++ b/console/Makefile
@@ -23,7 +23,7 @@ makemode := server
target = console
SRCS = main.c console.c focus.c vga-display.c vga.c dynafont.c bdf.c
-LCLHDRS = focus.h input.h console.h display.h vga.h vga-hw.h dynafont.h bdf.h \
+LCLHDRS = focus.h input.h console.h display-drv.h vga.h vga-hw.h dynafont.h bdf.h \
mutations.h priv.h
HURDLIBS = trivfs fshelp iohelp threads ports ihash shouldbeinlibc
diff --git a/console/console.c b/console/console.c
index 46dfa406..71422ffd 100644
--- a/console/console.c
+++ b/console/console.c
@@ -24,7 +24,7 @@
#include <cthreads.h>
#include "console.h"
-#include "display.h"
+#include "display-drv.h"
#include "input.h"
diff --git a/console/display.h b/console/display-drv.h
index 803d3180..803d3180 100644
--- a/console/display.h
+++ b/console/display-drv.h
diff --git a/console/vga-display.c b/console/vga-display.c
index ac1ebcb3..c3c35bbf 100644
--- a/console/vga-display.c
+++ b/console/vga-display.c
@@ -32,7 +32,7 @@
#include "vga.h"
#include "dynafont.h"
-#include "display.h"
+#include "display-drv.h"
struct vga_display_console