summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/dirent.h18
-rw-r--r--include/elf.h1
-rw-r--r--include/sched.h17
-rw-r--r--include/shadow.h1
-rw-r--r--include/stdio.h7
-rw-r--r--include/sys/epoll.h12
-rw-r--r--include/sys/reg.h2
-rw-r--r--include/sys/stat.h9
-rw-r--r--include/sys/user.h2
-rw-r--r--include/syslog.h2
10 files changed, 54 insertions, 17 deletions
diff --git a/include/dirent.h b/include/dirent.h
index 2d8fffb2..7fa60e06 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -9,14 +9,23 @@ extern "C" {
#define __NEED_ino_t
#define __NEED_off_t
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
#define __NEED_size_t
-#endif
+#define __NEED_ssize_t
#include <bits/alltypes.h>
#include <bits/dirent.h>
+typedef unsigned short reclen_t;
+
+struct posix_dent {
+ ino_t d_ino;
+ off_t d_off;
+ reclen_t d_reclen;
+ unsigned char d_type;
+ char d_name[];
+};
+
typedef struct __dirstream DIR;
#define d_fileno d_ino
@@ -29,6 +38,8 @@ int readdir_r(DIR *__restrict, struct dirent *__restrict, struct dire
void rewinddir(DIR *);
int dirfd(DIR *);
+ssize_t posix_getdents(int, void *, size_t, int);
+
int alphasort(const struct dirent **, const struct dirent **);
int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
@@ -37,7 +48,6 @@ void seekdir(DIR *, long);
long telldir(DIR *);
#endif
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define DT_UNKNOWN 0
#define DT_FIFO 1
#define DT_CHR 2
@@ -47,6 +57,8 @@ long telldir(DIR *);
#define DT_LNK 10
#define DT_SOCK 12
#define DT_WHT 14
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define IFTODT(x) ((x)>>12 & 017)
#define DTTOIF(x) ((x)<<12)
int getdents(int, struct dirent *, size_t);
diff --git a/include/elf.h b/include/elf.h
index 3d5e13e4..8b622f63 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -3329,6 +3329,7 @@ enum
#define R_LARCH_TLS_TPREL32 10
#define R_LARCH_TLS_TPREL64 11
#define R_LARCH_IRELATIVE 12
+#define R_LARCH_TLS_DESC64 14
#define R_LARCH_MARK_LA 20
#define R_LARCH_MARK_PCREL 21
#define R_LARCH_SOP_PUSH_PCREL 22
diff --git a/include/sched.h b/include/sched.h
index 204c34f5..8c3b53f0 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -78,11 +78,10 @@ int clone (int (*)(void *), void *, int, void *, ...);
int unshare(int);
int setns(int, int);
-void *memcpy(void *__restrict, const void *__restrict, size_t);
-int memcmp(const void *, const void *, size_t);
-void *memset (void *, int, size_t);
-void *calloc(size_t, size_t);
-void free(void *);
+int (memcmp)(const void *, const void *, size_t);
+void *(memset)(void *, int, size_t);
+void *(calloc)(size_t, size_t);
+void (free)(void *);
typedef struct cpu_set_t { unsigned long __bits[128/sizeof(long)]; } cpu_set_t;
int __sched_cpucount(size_t, const cpu_set_t *);
@@ -116,13 +115,13 @@ __CPU_op_func_S(XOR, ^)
#define CPU_XOR_S(a,b,c,d) __CPU_XOR_S(a,b,c,d)
#define CPU_COUNT_S(size,set) __sched_cpucount(size,set)
-#define CPU_ZERO_S(size,set) memset(set,0,size)
-#define CPU_EQUAL_S(size,set1,set2) (!memcmp(set1,set2,size))
+#define CPU_ZERO_S(size,set) (memset)(set,0,size)
+#define CPU_EQUAL_S(size,set1,set2) (!(memcmp)(set1,set2,size))
#define CPU_ALLOC_SIZE(n) (sizeof(long) * ( (n)/(8*sizeof(long)) \
+ ((n)%(8*sizeof(long)) + 8*sizeof(long)-1)/(8*sizeof(long)) ) )
-#define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n)))
-#define CPU_FREE(set) free(set)
+#define CPU_ALLOC(n) ((cpu_set_t *)(calloc)(1,CPU_ALLOC_SIZE(n)))
+#define CPU_FREE(set) (free)(set)
#define CPU_SETSIZE 1024
diff --git a/include/shadow.h b/include/shadow.h
index 2b1be413..a9d6940f 100644
--- a/include/shadow.h
+++ b/include/shadow.h
@@ -28,7 +28,6 @@ void setspent(void);
void endspent(void);
struct spwd *getspent(void);
struct spwd *fgetspent(FILE *);
-struct spwd *sgetspent(const char *);
int putspent(const struct spwd *, FILE *);
struct spwd *getspnam(const char *);
diff --git a/include/stdio.h b/include/stdio.h
index cb858618..4ea4c170 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -158,6 +158,13 @@ char *ctermid(char *);
#define L_ctermid 20
#endif
+#if defined(_GNU_SOURCE)
+#define RENAME_NOREPLACE (1 << 0)
+#define RENAME_EXCHANGE (1 << 1)
+#define RENAME_WHITEOUT (1 << 2)
+
+int renameat2(int, const char *, int, const char *, unsigned);
+#endif
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index ac81a841..5f975c4a 100644
--- a/include/sys/epoll.h
+++ b/include/sys/epoll.h
@@ -7,6 +7,7 @@ extern "C" {
#include <stdint.h>
#include <sys/types.h>
+#include <sys/ioctl.h>
#include <fcntl.h>
#define __NEED_sigset_t
@@ -54,6 +55,17 @@ __attribute__ ((__packed__))
#endif
;
+struct epoll_params {
+ uint32_t busy_poll_usecs;
+ uint16_t busy_poll_budget;
+ uint8_t prefer_busy_poll;
+
+ uint8_t __pad;
+};
+
+#define EPOLL_IOC_TYPE 0x8A
+#define EPIOCSPARAMS _IOW(EPOLL_IOC_TYPE, 0x01, struct epoll_params)
+#define EPIOCGPARAMS _IOR(EPOLL_IOC_TYPE, 0x02, struct epoll_params)
int epoll_create(int);
int epoll_create1(int);
diff --git a/include/sys/reg.h b/include/sys/reg.h
index 4e6ce222..0272e137 100644
--- a/include/sys/reg.h
+++ b/include/sys/reg.h
@@ -4,7 +4,7 @@
#include <limits.h>
#include <unistd.h>
-#include <bits/alltype.h>
+#include <bits/alltypes.h>
#undef __WORDSIZE
#if __LONG_MAX == 0x7fffffffL
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 57d640d7..c924ce2f 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -120,6 +120,9 @@ int lchmod(const char *, mode_t);
#define STATX_BASIC_STATS 0x7ffU
#define STATX_BTIME 0x800U
#define STATX_ALL 0xfffU
+#define STATX_MNT_ID 0x1000U
+#define STATX_DIOALIGN 0x2000U
+#define STATX_MNT_ID_UNIQUE 0x4000U
#define STATX_ATTR_COMPRESSED 0x4
#define STATX_ATTR_IMMUTABLE 0x10
@@ -157,7 +160,11 @@ struct statx {
uint32_t stx_rdev_minor;
uint32_t stx_dev_major;
uint32_t stx_dev_minor;
- uint64_t __pad1[14];
+ uint64_t stx_mnt_id;
+ uint32_t stx_dio_mem_align;
+ uint32_t stx_dio_offset_align;
+ uint64_t stx_subvol;
+ uint64_t __pad1[11];
};
int statx(int, const char *__restrict, int, unsigned, struct statx *__restrict);
diff --git a/include/sys/user.h b/include/sys/user.h
index 78036da3..511caba3 100644
--- a/include/sys/user.h
+++ b/include/sys/user.h
@@ -8,7 +8,7 @@ extern "C" {
#include <stdint.h>
#include <unistd.h>
-#include <bits/alltype.h>
+#include <bits/alltypes.h>
#undef __WORDSIZE
#if __LONG_MAX == 0x7fffffffL
diff --git a/include/syslog.h b/include/syslog.h
index 5b4d2964..57599e07 100644
--- a/include/syslog.h
+++ b/include/syslog.h
@@ -18,7 +18,7 @@ extern "C" {
#define LOG_PRIMASK 7
#define LOG_PRI(p) ((p)&LOG_PRIMASK)
-#define LOG_MAKEPRI(f, p) (((f)<<3)|(p))
+#define LOG_MAKEPRI(f, p) ((f)|(p))
#define LOG_MASK(p) (1<<(p))
#define LOG_UPTO(p) ((1<<((p)+1))-1)