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

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (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:

merging with upstream/master

File:

• uspace/lib/c/include/setjmp.h (modified) (2 diffs)

uspace/lib/c/include/setjmp.h

@@ -31 +31 @@
  */
 
-#ifndef LIBC_SETJMP_H_
-#define LIBC_SETJMP_H_
+#ifndef _LIBC_SETJMP_H_
+#define _LIBC_SETJMP_H_
 
 #ifdef __cplusplus
@@ -41 +41 @@
 #include <_bits/__noreturn.h>
 
-typedef context_t jmp_buf[1];
+typedef __context_t jmp_buf[1];
 
-extern int __setjmp(jmp_buf) __attribute__((returns_twice));
-extern __noreturn void __longjmp(jmp_buf, int);
+extern int __context_save(__context_t *) __attribute__((returns_twice));
+extern __noreturn void __context_restore(__context_t *, int);
 
-#define setjmp __setjmp
+#define setjmp __context_save
 extern __noreturn void longjmp(jmp_buf, int);