From d74894340d5635d58a3ab122bd857610355b693d Mon Sep 17 00:00:00 2001 From: Joakim Date: Sun, 19 Nov 2017 04:01:06 +0530 Subject: [PATCH 1/2] Add Bionic __assert. --- src/core/stdc/assert_.d | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/stdc/assert_.d b/src/core/stdc/assert_.d index a3675b70a6..48b302b9c8 100644 --- a/src/core/stdc/assert_.d +++ b/src/core/stdc/assert_.d @@ -64,6 +64,10 @@ else version (CRuntime_Glibc) /// void __assert_perror_fail(int errnum, const(char)* file, uint line, const(char)* func); } +else version (CRuntime_Bionic) +{ + void __assert(const(char)* __file, int __line, const(char)* __msg); +} else { static assert(0); From 0e7f1245536a41a0a5f3c6d547ecf70efee35e1a Mon Sep 17 00:00:00 2001 From: Joakim Date: Sun, 19 Nov 2017 04:02:22 +0530 Subject: [PATCH 2/2] Add Bionic __error and remove redundant OSX declaration. --- src/core/stdc/errno.d | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/core/stdc/errno.d b/src/core/stdc/errno.d index bb36e9f02a..2ab9983ec9 100644 --- a/src/core/stdc/errno.d +++ b/src/core/stdc/errno.d @@ -59,12 +59,12 @@ else version (FreeBSD) alias errno = __error; } } -else version (linux) +else version (CRuntime_Bionic) { extern (C) { - ref int __errno_location(); - alias errno = __errno_location; + ref int __errno(); + alias errno = __errno; } } else version (Darwin) @@ -75,14 +75,6 @@ else version (Darwin) alias errno = __error; } } -else version (OSX) -{ - extern (C) - { - ref int __error(); - alias errno = __error; - } -} else { ///