diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /console | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'console')
| -rw-r--r-- | console/Makefile | 5 | ||||
| -rw-r--r-- | console/priv.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/console/Makefile b/console/Makefile index 3eb4252e..10737489 100644 --- a/console/Makefile +++ b/console/Makefile @@ -1,4 +1,3 @@ -# # Copyright (C) 2002, 2012 Free Software Foundation, Inc. # Written by Marcus Brinkmann. # @@ -24,8 +23,6 @@ makemode := server target = console SRCS = console.c display.c pager.c input.c -LCLHDRS = display.h pager.h input.h priv.h mutations.h -DIST_FILES = hurd.ti motd.UTF8 MIGSTUBS = notifyServer.o tioctlServer.o fs_notifyUser.o @@ -36,8 +33,6 @@ MIGSFLAGS += -imacros $(srcdir)/mutations.h # This is the old monolithic version of the console server. #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 #OBJS = $(subst .c,.o,$(SRCS)) tioctlServer.o diff --git a/console/priv.h b/console/priv.h index c03bbc46..fdb96e7f 100644 --- a/console/priv.h +++ b/console/priv.h @@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ +#ifndef _CONSOLE_PRIV_H +#define _CONSOLE_PRIV_H + #include <hurd/hurd_types.h> #include <hurd/netfs.h> @@ -35,3 +38,4 @@ end_using_protid_port (struct protid *cred) if (cred) ports_port_deref (cred); } +#endif |