- (dtucker) [port-aix.h] Work around name collision on AIX for r_type by

   undef'ing it.

diff --git a/ChangeLog b/ChangeLog
index 78303a6f5b4c8013ecb42dcc494ca3c16939867b..ce12eaeb39fe9de30751bc680959c225dac7c1e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030714
  - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
    loginfailed at all, so assume 3-arg loginfailed if not declared.
+ - (dtucker) [port-aix.h] Work around name collision on AIX for r_type by
+   undef'ing it.
 
 20030708
  - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]

diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index 4627a82f0ff1a13fe87fabd2008f703f99b49ecb..2e5def54eaa4806ad8efdc40a5eac4666824a631 100644 (file)
--- 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)