diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-03-26 23:44:53 +0200 |
| commit | 511eff7bf616a313e6fc2397db718a81e93847cc (patch) | |
| tree | bc8c7d40221e4f0d728e2c5b3eb0a9802b99d95f /hostmux | |
| parent | d4b231dd9f874076c62f35590a9f6b93ca6481d7 (diff) | |
| parent | 69056411a354300a17d1e92027435c988508655d (diff) | |
| download | hurd-511eff7bf616a313e6fc2397db718a81e93847cc.tar.gz hurd-511eff7bf616a313e6fc2397db718a81e93847cc.tar.bz2 hurd-511eff7bf616a313e6fc2397db718a81e93847cc.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'hostmux')
| -rw-r--r-- | hostmux/hostmux-xinl.c | 4 | ||||
| -rw-r--r-- | hostmux/hostmux.h | 11 |
2 files changed, 8 insertions, 7 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__ */ |