Merge pull request #978 from no92/little-fixes

managarm · Feb 4, 2024 · 08d7213 · 08d7213
2 parents 84d7a13 + bb44cf5
commit 08d7213
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 23 deletions.
diff --git a/abis/linux/in.h b/abis/linux/in.h
@@ -4,6 +4,7 @@
 #include <bits/posix/in_addr_t.h>
 #include <bits/posix/in_port_t.h>
 #include <abi-bits/socket.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/options/ansi/include/stdio.h b/options/ansi/include/stdio.h
@@ -101,51 +101,51 @@ void setbuffer(FILE *, char *, size_t);
 
 // [C11-7.21.6] Formatted input/output functions
 
-__attribute__((__format__(gnu_printf, 2, 3)))
+__attribute__((__format__(printf, 2, 3)))
 int fprintf(FILE *__restrict stream, const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_scanf, 2, 3)))
+__attribute__((__format__(scanf, 2, 3)))
 int fscanf(FILE *__restrict stream, const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_printf, 1, 2)))
+__attribute__((__format__(printf, 1, 2)))
 int printf(const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_scanf, 1, 2)))
+__attribute__((__format__(scanf, 1, 2)))
 int scanf(const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_printf, 3, 4)))
+__attribute__((__format__(printf, 3, 4)))
 int snprintf(char *__restrict buffer, size_t max_size, const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_printf, 2, 3)))
+__attribute__((__format__(printf, 2, 3)))
 int sprintf(char *__restrict buffer, const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_scanf, 2, 3)))
+__attribute__((__format__(scanf, 2, 3)))
 int sscanf(const char *__restrict buffer, const char *__restrict format, ...);
 
-__attribute__((__format__(gnu_printf, 2, 0)))
+__attribute__((__format__(printf, 2, 0)))
 int vfprintf(FILE *__restrict stream, const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_scanf, 2, 0)))
+__attribute__((__format__(scanf, 2, 0)))
 int vfscanf(FILE *__restrict stream, const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_printf, 1, 0)))
+__attribute__((__format__(printf, 1, 0)))
 int vprintf(const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_scanf, 1, 0)))
+__attribute__((__format__(scanf, 1, 0)))
 int vscanf(const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_printf, 3, 0)))
+__attribute__((__format__(printf, 3, 0)))
 int vsnprintf(char *__restrict buffer, size_t max_size,
 		const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_printf, 2, 0)))
+__attribute__((__format__(printf, 2, 0)))
 int vsprintf(char *__restrict buffer, const char *__restrict format, __builtin_va_list args);
 
-__attribute__((__format__(gnu_scanf, 2, 0)))
+__attribute__((__format__(scanf, 2, 0)))
 int vsscanf(const char *__restrict buffer, const char *__restrict format, __builtin_va_list args);
 
 // this is a gnu extension
-__attribute__((__format__(gnu_printf, 2, 0)))
+__attribute__((__format__(printf, 2, 0)))
 int vasprintf(char **, const char *, __builtin_va_list);
 
 // [C11-7.21.7] Character input/output functions

diff --git a/options/bsd/include/bits/bsd/bsd_unistd.h b/options/bsd/include/bits/bsd/bsd_unistd.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #ifndef __MLIBC_ABI_ONLY
 
 void *sbrk(intptr_t increment);

diff --git a/options/glibc/include/net/route.h b/options/glibc/include/net/route.h
@@ -1,6 +1,8 @@
 #ifndef _NET_ROUTE_H
 #define _NET_ROUTE_H
 
+#include <sys/socket.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/options/glibc/include/netipx/ipx.h b/options/glibc/include/netipx/ipx.h
@@ -3,6 +3,7 @@
 
 #include <mlibc-config.h>
 #include <sys/socket.h>
+#include <stdint.h>
 
 typedef struct ipx_config_data {
 	unsigned char ipxcfg_auto_select_primary;

diff --git a/options/linux/include/scsi/sg.h b/options/linux/include/scsi/sg.h
@@ -6,19 +6,16 @@
 
 #define SG_GET_VERSION_NUM 0x2282
 
-#define SG_DXFER_NONE (-1)
-#define SG_DXFER_FROM_DEV (-3)
-
 #define SG_FLAG_DIRECT_IO 1
 #define SG_FLAG_LUN_INHIBIT 2
 
 #define SG_INFO_OK 0x0
 #define SG_INFO_OK_MASK 0x1
 
-#define SG_DXFER_NONE -1
-#define SG_DXFER_TO_DEV -2
-#define SG_DXFER_TO_FROM_DEV -3
-#define SG_DXFER_TO_FROM_DEV -4
+#define SG_DXFER_NONE (-1)
+#define SG_DXFER_TO_DEV (-2)
+#define SG_DXFER_FROM_DEV (-3)
+#define SG_DXFER_TO_FROM_DEV (-4)
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/options/posix/include/bits/posix/in_addr_t.h b/options/posix/include/bits/posix/in_addr_t.h
@@ -1,6 +1,8 @@
 #ifndef MLIBC_IN_ADDR_H
 #define MLIBC_IN_ADDR_H
 
+#include <stdint.h>
+
 typedef uint32_t in_addr_t;
 
 #endif // MLIBC_IN_ADDR_H
diff --git a/options/posix/include/bits/posix/in_port_t.h b/options/posix/include/bits/posix/in_port_t.h
@@ -1,6 +1,8 @@
 #ifndef MLIBC_IN_PORT_H
 #define MLIBC_IN_PORT_H
 
+#include <stdint.h>
+
 typedef uint16_t in_port_t;
 
 #endif // MLIBC_IN_PORT_H
diff --git a/options/posix/include/bits/posix/posix_stdio.h b/options/posix/include/bits/posix/posix_stdio.h
@@ -16,6 +16,8 @@ extern "C" {
 
 #ifndef __MLIBC_ABI_ONLY
 
+typedef struct __mlibc_file_base FILE;
+
 int fileno(FILE *file);
 FILE *fdopen(int fd, const char *mode);
 

diff --git a/options/posix/include/bits/posix/posix_stdlib.h b/options/posix/include/bits/posix/posix_stdlib.h
@@ -3,6 +3,7 @@
 #define MLIBC_POSIX_STDLIB_H
 
 #include <bits/posix/locale_t.h>
+#include <bits/size_t.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/options/posix/include/bits/posix/posix_string.h b/options/posix/include/bits/posix/posix_string.h
@@ -4,6 +4,7 @@
 
 #include <alloca.h>
 #include <bits/posix/locale_t.h>
+#include <bits/size_t.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/options/posix/include/bits/posix/posix_wctype.h b/options/posix/include/bits/posix/posix_wctype.h
@@ -10,6 +10,9 @@ extern "C" {
 
 #ifndef __MLIBC_ABI_ONLY
 
+typedef unsigned long wctype_t;
+typedef unsigned long wctrans_t;
+
 int iswalnum_l(wint_t, locale_t);
 int iswblank_l(wint_t, locale_t);
 int iswcntrl_l(wint_t, locale_t);

diff --git a/options/posix/include/netinet/ip.h b/options/posix/include/netinet/ip.h
@@ -15,7 +15,7 @@ extern "C" {
 #define IPTOS_THROUGHPUT 0x08
 #define IPTOS_RELIABILITY 0x04
 #define IPTOS_LOWCOST 0x02
-#define IPTOS_LOWDELAY IPTOS_LOWCOST
+#define IPTOS_MINCOST IPTOS_LOWCOST
 #define IPTOS_CLASS_CS4 0x80
 #define IPTOS_CLASS_CS6 0xC0
 

diff --git a/sysdeps/managarm/include/abi-bits/vt.h b/sysdeps/managarm/include/abi-bits/vt.h
@@ -0,0 +1 @@
+../../../../abis/linux/vt.h
diff --git a/sysdeps/managarm/meson.build b/sysdeps/managarm/meson.build
@@ -112,6 +112,7 @@ if not no_headers
 		'include/abi-bits/ioctls.h',
 		'include/abi-bits/xattr.h',
 		'include/abi-bits/msg.h',
+		'include/abi-bits/vt.h',
 		subdir: 'abi-bits',
 		follow_symlinks: true
 	)