From 2a7fb4a54c2ac9cb8396da117f0a05055330599c Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 6 Jun 2007 16:08:56 +0000 Subject: 2007-06-06 Thomas Schwinge * Makefile (default_pager-MIGCOMSFLAGS): Remove variable. * proxy-defpager.c (proxy_defpager_demuxer): Invoke `default_pager_server' instead of `S_default_pager_server'. --- trans/ChangeLog | 6 ++++++ trans/Makefile | 6 +----- trans/proxy-defpager.c | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/trans/ChangeLog b/trans/ChangeLog index 9fd21ae0..93c91df6 100644 --- a/trans/ChangeLog +++ b/trans/ChangeLog @@ -1,3 +1,9 @@ +2007-06-06 Thomas Schwinge + + * Makefile (default_pager-MIGCOMSFLAGS): Remove variable. + * proxy-defpager.c (proxy_defpager_demuxer): Invoke + `default_pager_server' instead of `S_default_pager_server'. + 2007-05-01 Thomas Schwinge * crash.c (S_msg_startup_dosync): Remove function. diff --git a/trans/Makefile b/trans/Makefile index c5e4184c..9d610952 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2006 +# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2006, 2007 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or @@ -33,10 +33,6 @@ password-LDLIBS = $(LIBCRYPT) include ../Makeconf -# hurd/default_pager.defs doesn't include hurd/hurd_types.defs and so won't -# obey SERVERPREFIX. -default_pager-MIGCOMSFLAGS = -prefix S_ - vpath elfcore.c $(top_srcdir)/exec symlink: fsysServer.o diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c index 1b4985c4..cda79592 100644 --- a/trans/proxy-defpager.c +++ b/trans/proxy-defpager.c @@ -1,6 +1,6 @@ /* A translator for providing access to Mach default_pager.defs control calls - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -231,9 +231,9 @@ int proxy_defpager_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp) { - extern int S_default_pager_server (mach_msg_header_t *, mach_msg_header_t *); + extern int default_pager_server (mach_msg_header_t *, mach_msg_header_t *); - return S_default_pager_server (inp, outp) + return default_pager_server (inp, outp) || trivfs_demuxer (inp, outp); } -- cgit v1.2.3