xlat: cleanup the aftermath of automatic conversion

diff --git a/file.c b/file.c
index 74f6adfd368ade13fea7086670b1589d0f4ba022..77f3f85a41525e9676195cf61dbc39fc3ed15d81 100644 (file)
--- a/file.c
+++ b/file.c
@@ -211,6 +211,17 @@ struct kernel_dirent {
        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 82972394fcc3946a0eae2fe7fbce375400a85106..e9fde4402d7515ce9835847d394882b015bf3721 100644 (file)
--- a/xlat/mmap_flags.in
+++ b/xlat/mmap_flags.in
@@ -42,10 +42,14 @@ MAP_INHERIT
 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 a777ea28d47264d50e0cf38f6eb7e7ca405ab293..b323f8b7c1d71b3de68751381b7f9c754bfd8acf 100644 (file)
--- a/xlat/open_mode_flags.in
+++ b/xlat/open_mode_flags.in
@@ -8,7 +8,9 @@ O_SYNC
 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 109b530c2ae823e96c3dd94cb0c2bc8853d3ab51..27bcff8a4bb89ecbe9c48c923b3be115c6866e07 100644 (file)
--- a/xlat/sigact_flags.in
+++ b/xlat/sigact_flags.in
@@ -3,9 +3,13 @@ SA_STACK
 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 869e5d534136572519eb7101d44fc35c666d0d76..61219d33c81ab83902627c446dd6444de73def8a 100644 (file)
--- a/xlat/wait4_options.in
+++ b/xlat/wait4_options.in
@@ -1,5 +1,7 @@
 WNOHANG
+#ifndef WSTOPPED
 WUNTRACED
+#endif
 WEXITED
 WTRAPPED
 WSTOPPED