From 1bd72eb51f179054cf0d4f791eed2c3a872f694e Mon Sep 17 00:00:00 2001 From: Xu Meng Date: Tue, 9 Jul 2019 03:43:56 -0500 Subject: [PATCH] ibmi: use correct header files IBM i defines both of the __PASE__ and _AIX macros. Commit 693b534 includes the wrong header file. Need to check macro __PASE__ prior to _AIX. PR-URL: https://github.com/libuv/libuv/pull/2371 Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau --- include/uv/unix.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/uv/unix.h b/include/uv/unix.h index bf786c9b..9080352d 100644 --- a/include/uv/unix.h +++ b/include/uv/unix.h @@ -49,6 +49,8 @@ # include "uv/linux.h" #elif defined (__MVS__) # include "uv/os390.h" +#elif defined(__PASE__) /* __PASE__ and _AIX are both defined on IBM i */ +# include "uv/posix.h" /* IBM i needs uv/posix.h, not uv/aix.h */ #elif defined(_AIX) # include "uv/aix.h" #elif defined(__sun) @@ -61,8 +63,7 @@ defined(__OpenBSD__) || \ defined(__NetBSD__) # include "uv/bsd.h" -#elif defined(__PASE__) || \ - defined(__CYGWIN__) || \ +#elif defined(__CYGWIN__) || \ defined(__MSYS__) || \ defined(__GNU__) # include "uv/posix.h"