Changeset bc73be3 in mainline for uspace/lib/c/include/setjmp.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/include/setjmp.h (modified) (1 diff)

uspace/lib/c/include/setjmp.h

@@ -31 +31 @@
  */
 
-#ifndef LIBC_SETJMP_H_
-#define LIBC_SETJMP_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _LIBC_SETJMP_H_
+#define _LIBC_SETJMP_H_
 
 #include <libarch/fibril_context.h>
 #include <_bits/__noreturn.h>
+#include <_bits/decls.h>
 
-typedef context_t jmp_buf[1];
+__C_DECLS_BEGIN;
 
-extern int __setjmp(jmp_buf) __attribute__((returns_twice));
-extern __noreturn void __longjmp(jmp_buf, int);
+typedef __context_t jmp_buf[1];
 
-#define setjmp __setjmp
+extern int __context_save(__context_t *) __attribute__((returns_twice));
+extern __noreturn void __context_restore(__context_t *, int);
+
 extern __noreturn void longjmp(jmp_buf, int);
 
-#ifdef __cplusplus
-}
-#endif
+__C_DECLS_END;
+
+#define setjmp __context_save
 
 #endif