more stuff

include/uapi/epoll.h

@@ -31,7 +31,7 @@ union __epoll_data {
     uint64_t u64;
 };
 
-struct epoll_event {
+struct __epoll_event {
     uint32_t events;
     union __epoll_data data;
 };

include/uapi/stat.h

@@ -33,19 +33,19 @@
 #define __S_IEXEC  __S_IXUSR
 
 struct __stat {
-    dev_t st_dev;
-    ino_t st_ino;
-    mode_t st_mode;
-    nlink_t st_nlink;
-    uid_t st_uid;
-    gid_t st_gid;
-    dev_t st_rdev;
-    off_t st_size;
-    struct timespec st_atim;
-    struct timespec st_mtim;
-    struct timespec st_ctim;
-    blksize_t st_blksize;
-    blkcnt_t st_blocks;
+    __dev_t st_dev;
+    __ino_t st_ino;
+    __mode_t st_mode;
+    __nlink_t st_nlink;
+    __uid_t st_uid;
+    __gid_t st_gid;
+    __dev_t st_rdev;
+    __off_t st_size;
+    struct __timespec st_atim;
+    struct __timespec st_mtim;
+    struct __timespec st_ctim;
+    __blksize_t st_blksize;
+    __blkcnt_t st_blocks;
 };
 
 #endif

include/uapi/time.h

@@ -4,27 +4,27 @@
 
 #include <stdint.h>
 
-typedef int64_t time_t;
-typedef int64_t suseconds_t;
+typedef int64_t __time_t;
+typedef int64_t __suseconds_t;
 
-struct timespec {
-    time_t tv_sec;
+struct __timespec {
+    __time_t tv_sec;
     int64_t tv_nsec;
 };
 
-struct timeval {
-    time_t tv_sec;
-    suseconds_t tv_usec;
+struct __timeval {
+    __time_t tv_sec;
+    __suseconds_t tv_usec;
 };
 
 struct itimerval {
-    struct timeval it_interval;
-    struct timeval it_value;
+    struct __timeval it_interval;
+    struct __timeval it_value;
 };
 
 struct itimerspec {
-    struct timespec it_interval;
-    struct timespec it_value;
+    struct __timespec it_interval;
+    struct __timespec it_value;
 };
 
 #define __ITIMER_REAL    0

include/uapi/types.h

@@ -4,21 +4,21 @@
 
 #include <stdint.h>
 
-typedef int64_t off_t;
-typedef off_t off64_t;
-typedef uintptr_t blksize_t;
-typedef uintptr_t blkcnt_t;
-typedef uintptr_t clockid_t;
-typedef uintptr_t dev_t;
-typedef uint32_t gid_t;
-typedef uintptr_t ino_t;
-typedef uint32_t mode_t;
-typedef uintptr_t nlink_t;
-typedef int32_t pid_t;
-typedef uintptr_t rlim_t;
-typedef uint32_t uid_t;
-typedef uintptr_t fsblkcnt_t;
-typedef uintptr_t fsfilcnt_t;
-typedef uintptr_t pthread_attr_t;
+typedef int64_t __off_t;
+typedef __off_t __off64_t;
+typedef uintptr_t __blksize_t;
+typedef uintptr_t __blkcnt_t;
+typedef uintptr_t __clockid_t;
+typedef uintptr_t __dev_t;
+typedef uint32_t __gid_t;
+typedef uintptr_t __ino_t;
+typedef uint32_t __mode_t;
+typedef uintptr_t __nlink_t;
+typedef int32_t __pid_t;
+typedef uintptr_t __rlim_t;
+typedef uint32_t __uid_t;
+typedef uintptr_t __fsblkcnt_t;
+typedef uintptr_t __fsfilcnt_t;
+typedef uintptr_t __pthread_attr_t;
 
 #endif