Merge remote-tracking branch 'toybox/master' into HEAD

[android-x86/external-toybox.git] / lib / portability.h

diff --git a/lib/portability.h b/lib/portability.h
index afe02c1..e3e0ef0 100644 (file)
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -45,6 +45,14 @@
 #define RLIMIT_RTTIME 15
 #endif
 
+// Introduced in Linux 3.1
+#ifndef SEEK_DATA
+#define SEEK_DATA 3
+#endif
+#ifndef SEEK_HOLE
+#define SEEK_HOLE 4
+#endif
+
 // We don't define GNU_dammit because we're not part of the gnu project, and
 // don't want to get any FSF on us. Unfortunately glibc (gnu libc)
 // won't give us Linux syscall wrappers without claiming to be part of the
@@ -82,46 +90,8 @@ char *dirname(char *path);
 char *__xpg_basename(char *path);
 static inline char *basename(char *path) { return __xpg_basename(path); }
 
-// uClibc pretends to be glibc and copied a lot of its bugs, but has a few more
-#if defined(__UCLIBC__)
-#include <unistd.h>
-#include <stdio.h>
-ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream);
-char *stpcpy(char *dest, const char *src);
-pid_t getsid(pid_t pid);
-
-// uClibc's last-ever release was in 2012, so of course it doesn't define
-// any flag newer than MS_MOVE, which was added in 2001 (linux 2.5.0.5),
-// eleven years earlier.
-
-#include <sys/mount.h>
-#ifndef MS_MOVE
-#define MS_MOVE       (1<<13)
-#endif
-#ifndef MS_REC
-#define MS_REC        (1<<14)
-#endif
-#ifndef MS_SILENT
-#define MS_SILENT     (1<<15)
-#endif
-#ifndef MS_UNBINDABLE
-#define MS_UNBINDABLE (1<<17)
-#endif
-#ifndef MS_PRIVATE
-#define MS_PRIVATE    (1<<18)
-#endif
-#ifndef MS_SLAVE
-#define MS_SLAVE      (1<<19)
-#endif
-#ifndef MS_SHARED
-#define MS_SHARED     (1<<20)
-#endif
-#ifndef MS_RELATIME
-#define MS_RELATIME (1<<21)
-#endif
-
 // When building under obsolete glibc (Ubuntu 8.04-ish), hold its hand a bit.
-#elif __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
 #define fstatat fstatat64
 int fstatat64(int dirfd, const char *pathname, void *buf, int flags);
 int readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
@@ -233,18 +203,18 @@ static inline void endutxent(void) {;}
 #ifndef O_NOFOLLOW
 #define O_NOFOLLOW 0
 #endif
-
 #ifndef O_NOATIME
 #define O_NOATIME 01000000
 #endif
-
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 02000000
 #endif
-
 #ifndef O_PATH
 #define O_PATH   010000000
 #endif
+#ifndef SCHED_RESET_ON_FORK
+#define SCHED_RESET_ON_FORK (1<<30)
+#endif
 
 // Glibc won't give you linux-kernel constants unless you say "no, a BUD lite"
 // even though linux has nothing to do with the FSF and never has.
@@ -270,7 +240,7 @@ pid_t xfork(void);
 //#define strncpy(...) @@strncpyisbadmmkay@@
 //#define strncat(...) @@strncatisbadmmkay@@
 
-#ifdef __ANDROID__
+#if CFG_TOYBOX_ANDROID_SCHEDPOLICY && defined(__BIONIC__)
 #include <cutils/sched_policy.h>
 #else
 static inline int get_sched_policy(int tid, void *policy) {return 0;}