Usermode - Misc header changes

diff --git a/Usermode/Applications/axwin3_src/WM/input.c b/Usermode/Applications/axwin3_src/WM/input.c
index 352bdee..469c08e 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/input.c
+++ b/Usermode/Applications/axwin3_src/WM/input.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <acess/sys.h>
 #include <wm_input.h>
+#include <stddef.h>
 
 // TODO: Move out to a common header
 typedef struct

diff --git a/Usermode/Libraries/ld-acess.so_src/arch/syscalls.s.h b/Usermode/Libraries/ld-acess.so_src/arch/syscalls.s.h
index aef2247..a978a35 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/arch/syscalls.s.h
+++ b/Usermode/Libraries/ld-acess.so_src/arch/syscalls.s.h
@@ -52,5 +52,6 @@ SYSCALL1(chdir, SYS_CHDIR)    // char*
 SYSCALL3(ioctl, SYS_IOCTL)     // int, int, void*
 SYSCALL4(_SysMount, SYS_MOUNT) // char*, char*, char*, char*
 SYSCALL6(_SysSelect, SYS_SELECT)       // int, fd_set*, fd_set*, fd_set*, tTime*, uint32_t
+SYSCALL1(unlink, SYS_UNLINK)   // const char*
 
 SYSCALL3(_SysOpenChild, SYS_OPENCHILD)

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
index 36086d0..4214b5a 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
@@ -3,6 +3,10 @@
 #ifndef _ACESS_INTDEFS_H_
 #define _ACESS_INTDEFS_H_
 
+#include <stdint.h>
+#include <limits.h>
+
+#if 0
 #define INT_MIN        -0x80000000
 #define INT_MAX        0x7FFFFFFF
 
@@ -29,7 +33,7 @@ typedef __uint32_t    __uintptr_t;
 # error "Unknown pointer size"
 #endif
 
-//typedef uint64_t     off_t;
+#endif
 
 #endif
 

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
index 25a91be..1494c99 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
@@ -79,6 +79,7 @@ extern int    _SysGetACL(int fd, t_sysACL *dest);
 extern int     _SysMount(const char *Device, const char *Directory, const char *Type, const char *Options);
 extern int     _SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *err, int64_t *timeout, unsigned int extraevents);
 #define select(nfs, rdfds, wrfds, erfds, timeout)      _SysSelect(nfs, rdfds, wrfds, erfds, timeout, 0)
+extern int     unlink(const char *pathname);
 
 // --- IPC ---
 extern int     SysSendMessage(pid_t dest, uint length, const void *Data);

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/sys/stat.h b/Usermode/Libraries/ld-acess.so_src/include_exp/sys/stat.h
index 31d8b14..4a1c107 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/sys/stat.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/sys/stat.h
@@ -5,19 +5,19 @@
 #ifndef _SYS_STAT_H_
 #define _SYS_STAT_H_
 
-#include "../acess/intdefs.h"  /* Evil */
+//#include "../acess/intdefs.h"        /* Evil */
 //#include "../stddef.h"
+#include <stdint.h>
 
-;
 typedef void   *dev_t; /* TODO: How to identify a device with Acess */
-typedef __uint64_t     ino_t;
+typedef uint64_t       ino_t;
 typedef unsigned int   blksize_t;
-typedef __uint64_t     blkcnt_t;
+typedef uint64_t       blkcnt_t;
 typedef unsigned int   nlink_t;
-typedef __uint32_t     mode_t;
+typedef uint32_t       mode_t;
 
-typedef __uint32_t     uid_t;
-typedef __uint32_t     gid_t;
+typedef uint32_t       uid_t;
+typedef uint32_t       gid_t;
 
 #define        S_IFMT          0170000 /* type of file */
 #define                S_IFDIR 0040000 /* directory */

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/sys/types.h b/Usermode/Libraries/ld-acess.so_src/include_exp/sys/types.h
index 4e38de3..ef4c24d 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/sys/types.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/sys/types.h
@@ -54,10 +54,6 @@ extern void  FD_CLR(int fd, fd_set *fdsetp);
 extern void    FD_SET(int fd, fd_set *fdsetp);
 extern int     FD_ISSET(int fd, fd_set *fdsetp);
 
-typedef __uint8_t      u_int8_t;
-typedef __uint16_t     u_int16_t;
-typedef __uint32_t     u_int32_t;
-
 #include "../sys/stat.h"
 
 #endif

diff --git a/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h b/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h
index ecf5ce8..d53b94a 100644 (file)
--- a/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h
+++ b/Usermode/Libraries/libpsocket.so_src/include_exp/sys/socket.h
@@ -10,6 +10,7 @@
 #define _SYS_SOCKETS_H_
 
 #include <sys/types.h>
+#include <stddef.h>    // size_t
 
 typedef int    socklen_t;