Merge from gnulib.

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/filemode.c b/lib/filemode.c
index ed8c6c989f1..24ffeae7c99 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -78,7 +78,7 @@ ftypelet (mode_t bits)
     return 'C';
   if (S_ISDOOR (bits))
     return 'D';
-  if (S_ISMPB (bits) || S_ISMPC (bits))
+  if (S_ISMPB (bits) || S_ISMPC (bits) || S_ISMPX (bits))
     return 'm';
   if (S_ISNWK (bits))
     return 'n';
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h
index ac05ddb5cec..936c0fb8c48 100644
--- a/lib/sys_stat.in.h
+++ b/lib/sys_stat.in.h
@@ -150,6 +150,10 @@
 # endif
 #endif
 
+#ifndef S_ISMPX /* AIX */
+# define S_ISMPX(m) 0
+#endif
+
 #ifndef S_ISNAM /* Xenix */
 # ifdef S_IFNAM
 #  define S_ISNAM(m) (((m) & S_IFMT) == S_IFNAM)