Changeset e5d9274 for libcfa/src/assert.cfa

Timestamp:

Jun 2, 2022, 3:11:21 PM (23 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/assert.cfa (modified) (3 diffs)

libcfa/src/assert.cfa

@@ -19 +19 @@
 #include <unistd.h>                                                             // STDERR_FILENO
 #include "bits/debug.hfa"
+#include "bits/defs.hfa"
 
 extern "C" {
@@ -26 +27 @@
 
         // called by macro assert in assert.h
-        void __assert_fail( const char assertion[], const char file[], unsigned int line, const char function[] ) {
+        // would be cool to remove libcfa_public but it's needed for libcfathread
+        void __assert_fail( const char assertion[], const char file[], unsigned int line, const char function[] ) libcfa_public {
                 __cfaabi_bits_print_safe( STDERR_FILENO, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
                 abort();
@@ -32 +34 @@
 
         // called by macro assertf
-        void __assert_fail_f( const char assertion[], const char file[], unsigned int line, const char function[], const char fmt[], ... ) {
+        // would be cool to remove libcfa_public but it's needed for libcfathread
+        void __assert_fail_f( const char assertion[], const char file[], unsigned int line, const char function[], const char fmt[], ... ) libcfa_public {
                 __cfaabi_bits_acquire();
                 __cfaabi_bits_print_nolock( STDERR_FILENO, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );