xlat: cleanup the aftermath of automatic conversion
diff --git a/file.c b/file.c
index 74f6adf..77f3f85 100644
--- a/file.c
+++ b/file.c
@@ -211,6 +211,17 @@
char d_name[1];
};
+#ifdef O_LARGEFILE
+# if O_LARGEFILE == 0 /* biarch platforms in 64-bit mode */
+# undef O_LARGEFILE
+# ifdef SPARC64
+# define O_LARGEFILE 0x40000
+# elif defined X86_64 || defined S390X
+# define O_LARGEFILE 0100000
+# endif
+# endif
+#endif
+
#include "xlat/open_access_modes.h"
#include "xlat/open_mode_flags.h"
diff --git a/xlat/mmap_flags.in b/xlat/mmap_flags.in
index 8297239..e9fde44 100644
--- a/xlat/mmap_flags.in
+++ b/xlat/mmap_flags.in
@@ -42,10 +42,14 @@
MAP_FILE
MAP_LOCKED
/* FreeBSD ones */
+#if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
MAP_ANON
+#endif
MAP_HASSEMAPHORE
MAP_STACK
MAP_HUGETLB
+#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0
MAP_UNINITIALIZED
+#endif
MAP_NOSYNC
MAP_NOCORE
diff --git a/xlat/open_mode_flags.in b/xlat/open_mode_flags.in
index a777ea2..b323f8b 100644
--- a/xlat/open_mode_flags.in
+++ b/xlat/open_mode_flags.in
@@ -8,7 +8,9 @@
O_ASYNC
O_DSYNC
O_RSYNC
+#if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
O_NDELAY
+#endif
O_PRIV
O_DIRECT
O_LARGEFILE
diff --git a/xlat/sigact_flags.in b/xlat/sigact_flags.in
index 109b530..27bcff8 100644
--- a/xlat/sigact_flags.in
+++ b/xlat/sigact_flags.in
@@ -3,9 +3,13 @@
SA_RESTART
SA_INTERRUPT
SA_NODEFER
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
SA_NOMASK
+#endif
SA_RESETHAND
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
SA_ONESHOT
+#endif
SA_SIGINFO
SA_RESETHAND
SA_ONSTACK
diff --git a/xlat/wait4_options.in b/xlat/wait4_options.in
index 869e5d5..61219d3 100644
--- a/xlat/wait4_options.in
+++ b/xlat/wait4_options.in
@@ -1,5 +1,7 @@
WNOHANG
+#ifndef WSTOPPED
WUNTRACED
+#endif
WEXITED
WTRAPPED
WSTOPPED