Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-05-28 15:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed header conflict

Browse Source
This commit is contained in:
Alex 2022-12-15 02:57:36 +02:00
parent f9ae9df392
commit 06eb5a1467
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/stdarg.h
View File

@ -1,7 +1,9 @@
#ifndef _STDARG_H #ifndef _STDARG_H
#define _STDARG_H #define _STDARG_H
#ifndef __va_list__
typedef __builtin_va_list va_list; typedef __builtin_va_list va_list;
#endif
#define va_start(ap, last) __builtin_va_start(ap, last) #define va_start(ap, last) __builtin_va_start(ap, last)
#define va_end(ap) __builtin_va_end(ap) #define va_end(ap) __builtin_va_end(ap)

5
libc/include/stddef.h
View File

@ -1,7 +1,12 @@
#ifndef _STDDEF_H #ifndef _STDDEF_H
#define _STDDEF_H #define _STDDEF_H
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0) #define NULL ((void *)0)
#define bool _Bool
#endif
typedef __INT8_TYPE__ int8_t; typedef __INT8_TYPE__ int8_t;
typedef __INT16_TYPE__ int16_t; typedef __INT16_TYPE__ int16_t;

18
libc/include/types.h
View File

@ -1,6 +1,9 @@
#ifndef __FENNIX_LIBC_TYPES_H__ #ifndef __FENNIX_LIBC_TYPES_H__
#define __FENNIX_LIBC_TYPES_H__ #define __FENNIX_LIBC_TYPES_H__
#include <stddef.h>
#include <stdarg.h>
#ifdef __cplusplus #ifdef __cplusplus
#define EXTERNC extern "C" #define EXTERNC extern "C"
#define START_EXTERNC \ #define START_EXTERNC \
@ -14,13 +17,6 @@
#define END_EXTERNC #define END_EXTERNC
#endif #endif
#ifdef __cplusplus
#define NULL 0
#else
#define NULL ((void *)0)
#define bool _Bool
#endif
#define asm __asm__ #define asm __asm__
#define asmv __asm__ volatile #define asmv __asm__ volatile
@ -38,14 +34,6 @@
#define toupper(c) ((c)-0x20 * (((c) >= 'a') && ((c) <= 'z'))) #define toupper(c) ((c)-0x20 * (((c) >= 'a') && ((c) <= 'z')))
#define tolower(c) ((c) + 0x20 * (((c) >= 'A') && ((c) <= 'Z'))) #define tolower(c) ((c) + 0x20 * (((c) >= 'A') && ((c) <= 'Z')))
#ifndef __va_list__
typedef __builtin_va_list va_list;
#endif
#define va_start(v, l) __builtin_va_start(v, l)
#define va_end(v) __builtin_va_end(v)
#define va_arg(v, l) __builtin_va_arg(v, l)
#define ALIGN_UP(x, align) ((__typeof__(x))(((uint64_t)(x) + ((align)-1)) & (~((align)-1)))) #define ALIGN_UP(x, align) ((__typeof__(x))(((uint64_t)(x) + ((align)-1)) & (~((align)-1))))
#define ALIGN_DOWN(x, align) ((__typeof__(x))((x) & (~((align)-1)))) #define ALIGN_DOWN(x, align) ((__typeof__(x))((x) & (~((align)-1))))