diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-09-21 21:15:02 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-09-21 21:15:02 +0000 |
commit | 55d2bf5bef0a04bd976b35f968598637e26e95ed (patch) | |
tree | 28c36cf6deafd8994704b678a01a149a05226ee1 /pfinet/pfinet.h | |
parent | a64baf761265b4a09b058e146485c102b52a3449 (diff) | |
download | hurd-55d2bf5bef0a04bd976b35f968598637e26e95ed.tar.gz hurd-55d2bf5bef0a04bd976b35f968598637e26e95ed.tar.bz2 hurd-55d2bf5bef0a04bd976b35f968598637e26e95ed.zip |
Use route.h from glibc
Unfortunately the Linux source also uses <net/route.h>, so we have to
both make that include the glibc-provided one, and avoid making it emit
Linuxish definitions when they would conflict with glibc definitions.
Diffstat (limited to 'pfinet/pfinet.h')
-rw-r--r-- | pfinet/pfinet.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pfinet/pfinet.h b/pfinet/pfinet.h index f8a1dd8d..df8da526 100644 --- a/pfinet/pfinet.h +++ b/pfinet/pfinet.h @@ -29,7 +29,12 @@ #include <sys/mman.h> #include <sys/socket.h> #include <pthread.h> -#include "route.h" + +/* Unfortunately the Linux source also uses <net/route.h>. + * Here we want the glibc-provided one only */ +#define _ROUTE_H +#include <net/route.h> +#undef _ROUTE_H extern pthread_mutex_t global_lock; extern pthread_mutex_t net_bh_lock; |