Module Name: src
Committed By: thorpej
Date: Sat May 18 01:16:21 UTC 2024
Modified Files:
src/sys/sys: ucontext.h
Log Message:
Define the _UC_* flag bits before including <sys/mcontext.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/ucontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/ucontext.h
diff -u src/sys/sys/ucontext.h:1.20 src/sys/sys/ucontext.h:1.21
--- src/sys/sys/ucontext.h:1.20 Sat May 18 00:37:41 2024
+++ src/sys/sys/ucontext.h Sat May 18 01:16:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ucontext.h,v 1.20 2024/05/18 00:37:41 thorpej Exp $ */
+/* $NetBSD: ucontext.h,v 1.21 2024/05/18 01:16:21 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2003, 2024 The NetBSD Foundation, Inc.
@@ -33,24 +33,6 @@
#define _SYS_UCONTEXT_H_
#include <sys/sigtypes.h>
-#include <machine/mcontext.h>
-
-typedef struct __ucontext ucontext_t;
-
-struct __ucontext {
- unsigned int uc_flags; /* properties */
- ucontext_t * uc_link; /* context to resume */
- sigset_t uc_sigmask; /* signals blocked in this context */
- stack_t uc_stack; /* the stack used by this context */
- mcontext_t uc_mcontext; /* machine state */
-#if defined(_UC_MACHINE_PAD)
- long __uc_pad[_UC_MACHINE_PAD];
-#endif
-};
-
-#ifndef _UC_UCONTEXT_ALIGN
-#define _UC_UCONTEXT_ALIGN (~0)
-#endif
/* uc_flags */
#define _UC_SIGMASK 0x01 /* valid uc_sigmask */
@@ -81,6 +63,25 @@ struct __ucontext {
* _UC_CLRSTACK Context does not use signal stack
*/
+#include <machine/mcontext.h>
+
+typedef struct __ucontext ucontext_t;
+
+struct __ucontext {
+ unsigned int uc_flags; /* properties */
+ ucontext_t * uc_link; /* context to resume */
+ sigset_t uc_sigmask; /* signals blocked in this context */
+ stack_t uc_stack; /* the stack used by this context */
+ mcontext_t uc_mcontext; /* machine state */
+#if defined(_UC_MACHINE_PAD)
+ long __uc_pad[_UC_MACHINE_PAD];
+#endif
+};
+
+#ifndef _UC_UCONTEXT_ALIGN
+#define _UC_UCONTEXT_ALIGN (~0)
+#endif
+
#ifndef _UC_TLSBASE
#error _UC_TLSBASE not defined.
#endif
