projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use a common definition of NULL as 0L for C and C++
[musl]
/
include
/
stdlib.h
diff --git
a/include/stdlib.h
b/include/stdlib.h
index
14cc71b
..
671d188
100644
(file)
--- a/
include/stdlib.h
+++ b/
include/stdlib.h
@@
-5,18
+5,9
@@
extern "C" {
#endif
extern "C" {
#endif
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
+#include <features.h>
-#undef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
+#define NULL 0L
#define __NEED_size_t
#define __NEED_wchar_t
#define __NEED_size_t
#define __NEED_wchar_t
@@
-46,12
+37,12
@@
void *realloc (void *, size_t);
void free (void *);
void *aligned_alloc(size_t alignment, size_t size);
void free (void *);
void *aligned_alloc(size_t alignment, size_t size);
-void abort (void);
+
_Noreturn
void abort (void);
int atexit (void (*) (void));
int atexit (void (*) (void));
-void exit (int);
-void _Exit (int);
+
_Noreturn
void exit (int);
+
_Noreturn
void _Exit (int);
int at_quick_exit (void (*) (void));
int at_quick_exit (void (*) (void));
-void quick_exit (int);
+
_Noreturn
void quick_exit (int);
char *getenv (const char *);
char *getenv (const char *);
@@
-90,16
+81,15
@@
size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
-#ifndef WEXITSTATUS
+#define WNOHANG 1
+#define WUNTRACED 2
+
#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
#define WTERMSIG(s) ((s) & 0x7f)
#define WSTOPSIG(s) WEXITSTATUS(s)
#define WEXITSTATUS(s) (((s) & 0xff00) >> 8)
#define WTERMSIG(s) ((s) & 0x7f)
#define WSTOPSIG(s) WEXITSTATUS(s)
-#define WCOREDUMP(s) ((s) & 0x80)
#define WIFEXITED(s) (!WTERMSIG(s))
#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
#define WIFEXITED(s) (!WTERMSIG(s))
#define WIFSTOPPED(s) (((s) & 0xff) == 0x7f)
#define WIFSIGNALED(s) (((signed char) (((s) & 0x7f) + 1) >> 1) > 0)
-#define WIFCONTINUED(s) ((s) == 0xffff)
-#endif
int posix_memalign (void **, size_t, size_t);
int setenv (const char *, const char *, int);
int posix_memalign (void **, size_t, size_t);
int setenv (const char *, const char *, int);
@@
-146,6
+136,8
@@
void lcong48 (unsigned short [7]);
char *mktemp (char *);
void *valloc (size_t);
void *memalign(size_t, size_t);
char *mktemp (char *);
void *valloc (size_t);
void *memalign(size_t, size_t);
+#define WCOREDUMP(s) ((s) & 0x80)
+#define WIFCONTINUED(s) ((s) == 0xffff)
#endif
#ifdef _GNU_SOURCE
#endif
#ifdef _GNU_SOURCE