summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--console/ChangeLog5
-rw-r--r--console/Makefile4
-rw-r--r--console/focus.c2
-rw-r--r--console/main.c2
-rw-r--r--console/vcons.c (renamed from console/console.c)4
-rw-r--r--console/vcons.h (renamed from console/console.h)2
6 files changed, 12 insertions, 7 deletions
diff --git a/console/ChangeLog b/console/ChangeLog
index a51a927b..513802c6 100644
--- a/console/ChangeLog
+++ b/console/ChangeLog
@@ -6,6 +6,11 @@
* console.c: Likewise.
* Makefile (LCLHDRS): Rename input.h to input-drv.h.
+ * main.c: Include "vcons.h" instead "console.h".
+ * focus.c: Likewise.
+ * Makefile (LCLHDRS): Rename console.h to vcons.h.
+ (SRCS): Rename console.c to vcons.c.
+
2002-06-04 Marcus Brinkmann <marcus@gnu.org>
* display.h: New file.
diff --git a/console/Makefile b/console/Makefile
index 7174787f..a5de1e49 100644
--- a/console/Makefile
+++ b/console/Makefile
@@ -22,8 +22,8 @@ dir := console
makemode := server
target = console
-SRCS = main.c console.c focus.c vga-display.c vga.c dynafont.c bdf.c
-LCLHDRS = focus.h input-drv.h console.h display-drv.h vga.h vga-hw.h dynafont.h bdf.h \
+SRCS = main.c vcons.c focus.c vga-display.c vga.c dynafont.c bdf.c
+LCLHDRS = focus.h input-drv.h vcons.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/focus.c b/console/focus.c
index c9779af1..0e2fc1f4 100644
--- a/console/focus.c
+++ b/console/focus.c
@@ -2,7 +2,7 @@
#include <cthreads.h>
#include <string.h>
-#include "console.h"
+#include "vcons.h"
#include "input-drv.h"
#include "focus.h"
diff --git a/console/main.c b/console/main.c
index cd28bc96..9ea5ec11 100644
--- a/console/main.c
+++ b/console/main.c
@@ -31,7 +31,7 @@
#include "priv.h"
#include "tioctl_S.h"
-#include "console.h"
+#include "vcons.h"
#include "focus.h"
diff --git a/console/console.c b/console/vcons.c
index cecdb5b4..2e755b2c 100644
--- a/console/console.c
+++ b/console/vcons.c
@@ -1,4 +1,4 @@
-/* console.c - The device independant part of a console.
+/* vcons.c - The device independant part of a console.
Copyright (C) 2002 Free Software Foundation, Inc.
Written by Marcus Brinkmann.
@@ -23,7 +23,7 @@
#include <string.h>
#include <cthreads.h>
-#include "console.h"
+#include "vcons.h"
#include "display-drv.h"
#include "input-drv.h"
diff --git a/console/console.h b/console/vcons.h
index b768afa4..06c611da 100644
--- a/console/console.h
+++ b/console/vcons.h
@@ -1,4 +1,4 @@
-/* console.h - Interface for the device independant part of a virtual console.
+/* vcons.h - Interface for the device independant part of a virtual console.
Copyright (C) 2002 Free Software Foundation, Inc.
Written by Marcus Brinkmann.