summaryrefslogtreecommitdiff
path: root/openbsd-compat/port-aix.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-14 16:26:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-14 16:26:51 +1000
commit30317e37e4c3ba6b0a7c0b21f17760e4f45a6b12 (patch)
tree925f09ce92f2e71463e7bc6c47edfb55c2c4e717 /openbsd-compat/port-aix.h
parent5c6a91a39d83f2fe68de28d9635076dd4066d7e2 (diff)
- (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
undef'ing it.
Diffstat (limited to 'openbsd-compat/port-aix.h')
-rw-r--r--openbsd-compat/port-aix.h5
1 files changed, 5 insertions, 0 deletions
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 @@
35# endif 35# endif
36#endif 36#endif
37 37
38/* Some versions define r_type in the above headers, which causes a conflict */
39#ifdef r_type
40# undef r_type
41#endif
42
38/* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */ 43/* AIX 4.2.x doesn't have nanosleep but does have nsleep which is equivalent */
39#if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP) 44#if !defined(HAVE_NANOSLEEP) && defined(HAVE_NSLEEP)
40# define nanosleep(a,b) nsleep(a,b) 45# define nanosleep(a,b) nsleep(a,b)