From 30317e37e4c3ba6b0a7c0b21f17760e4f45a6b12 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 14 Jul 2003 16:26:51 +1000 Subject: - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by undef'ing it. --- openbsd-compat/port-aix.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'openbsd-compat/port-aix.h') diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 4627a82f0..2e5def54e 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -35,6 +35,11 @@ # endif #endif +/* Some versions define r_type in the above headers, which causes a conflict */ +#ifdef r_type +# undef r_type +#endif + /* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ #if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) # define nanosleep(a,b) nsleep(a,b) -- cgit v1.2.3