diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /hostmux | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'hostmux')
| -rw-r--r-- | hostmux/hostmux-xinl.c | 4 | ||||
| -rw-r--r-- | hostmux/hostmux.h | 11 | ||||
| -rw-r--r-- | hostmux/leaf.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/hostmux/hostmux-xinl.c b/hostmux/hostmux-xinl.c index e8ab1493..4e11968e 100644 --- a/hostmux/hostmux-xinl.c +++ b/hostmux/hostmux-xinl.c @@ -18,7 +18,5 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#define HOSTMUX_EI -#undef __OPTIMIZE__ -#define __OPTIMIZE__ 1 +#define HOSTMUX_DEFINE_EI #include "hostmux.h" diff --git a/hostmux/hostmux.h b/hostmux/hostmux.h index 10170002..98ef04ac 100644 --- a/hostmux/hostmux.h +++ b/hostmux/hostmux.h @@ -24,6 +24,13 @@ #include <hurd/netfs.h> #include <rwlock.h> #include <maptime.h> +#include <features.h> + +#ifdef HOSTMUX_DEFINE_EI +#define HOSTMUX_EI +#else +#define HOSTMUX_EI __extern_inline +#endif /* Handy source of time. */ volatile struct mapped_time_value *hostmux_maptime; @@ -85,8 +92,4 @@ struct netnode struct hostmux_name *name; }; -#ifndef HOSTMUX_EI -# define HOSTMUX_EI extern inline -#endif - #endif /* __HOSTMUX_H__ */ diff --git a/hostmux/leaf.c b/hostmux/leaf.c index aba32b84..fb53622f 100644 --- a/hostmux/leaf.c +++ b/hostmux/leaf.c @@ -53,7 +53,7 @@ netfs_get_translator (struct node *node, char **argz, size_t *argz_len) *argz = 0; /* Initialize return value. */ *argz_len = 0; - /* Return a copy of MUX's translator template, with occurances of + /* Return a copy of MUX's translator template, with occurrences of HOST_PAT replaced by the canonical hostname. */ err = argz_append (argz, argz_len, mux->trans_template, mux->trans_template_len); |