From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 26 Apr 2014 15:35:02 +0000 (+0000)
Subject: xlat: cleanup the aftermath of automatic conversion
X-Git-Tag: v4.9~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63ebcfc55920544a5fd2deaba64540b671cb6d1e;p=strace

xlat: cleanup the aftermath of automatic conversion
---

diff --git a/file.c b/file.c
index 74f6adfd..77f3f85a 100644
--- 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 82972394..e9fde440 100644
--- 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 a777ea28..b323f8b7 100644
--- 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 109b530c..27bcff8a 100644
--- 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 869e5d53..61219d33 100644
--- a/xlat/wait4_options.in
+++ b/xlat/wait4_options.in
@@ -1,5 +1,7 @@
 WNOHANG
+#ifndef WSTOPPED
 WUNTRACED
+#endif
 WEXITED
 WTRAPPED
 WSTOPPED