From 26ba506b86c0152030c7c761e744cb2b0d2d703a Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Jun 05 2019 20:17:15 +0000
Subject: SEH exception handling: coding style: refactor references to system structures.


---

diff --git a/arch/nt64/psxseh.h b/arch/nt64/psxseh.h
index c351ff8..ed636ec 100644
--- a/arch/nt64/psxseh.h
+++ b/arch/nt64/psxseh.h
@@ -4,8 +4,8 @@
 
 enum __unwind_reason_code;
 
-struct _nt_exception_record;
-struct _nt_dispatcher_context;
+struct __exception_record;
+struct __dispatcher_context;
 
 struct __unwind_exception;
 struct __unwind_context;
@@ -28,17 +28,17 @@ typedef void (*__unwind_exception_cleanup_routine)(
 
 struct __seh_vtbl {
 	int    (*seh_exception_filter)(
-		struct _nt_exception_record *,
+		struct __exception_record *,
 		void *,
 		__thread_context *,
-		struct _nt_dispatcher_context *,
+		struct __dispatcher_context *,
 		__unwind_personality_routine);
 
 	int    (*seh_exception_handler)(
-		struct _nt_exception_record *,
+		struct __exception_record *,
 		uintptr_t,
 		__thread_context *,
-		struct _nt_dispatcher_context *);
+		struct __dispatcher_context *);
 
 	int    (*seh_unwind_raise_exception)(
 		struct __unwind_exception *);
diff --git a/include/sys/unwind.h b/include/sys/unwind.h
index 9267db6..6fb2c2c 100644
--- a/include/sys/unwind.h
+++ b/include/sys/unwind.h
@@ -30,8 +30,8 @@ enum __unwind_reason_code {
 
 
 
-struct _nt_exception_record;
-struct _nt_dispatcher_context;
+struct __exception_record;
+struct __dispatcher_context;
 
 struct __unwind_exception;
 struct __unwind_context;
@@ -59,17 +59,17 @@ struct __unwind_exception {
 
 
 int    __unwind_exception_filter(
-	struct _nt_exception_record *,
+	struct __exception_record *,
 	void *,
 	mcontext_t *,
-	struct _nt_dispatcher_context *,
+	struct __dispatcher_context *,
 	__unwind_personality_routine);
 
 int    __unwind_exception_handler(
-	struct _nt_exception_record *,
+	struct __exception_record *,
 	uintptr_t,
 	mcontext_t *,
-	struct _nt_dispatcher_context *);
+	struct __dispatcher_context *);
 
 int    __unwind_raise_exception(
 	struct __unwind_exception *);
diff --git a/src/arch/nt64/unwind.c b/src/arch/nt64/unwind.c
index 2676683..8ed0bdd 100644
--- a/src/arch/nt64/unwind.c
+++ b/src/arch/nt64/unwind.c
@@ -7,10 +7,10 @@ extern const struct __seh_vtbl * __eh_vtbl;
 
 
 int __unwind_exception_filter(
-	struct _nt_exception_record * erec,
+	struct __exception_record * erec,
 	void * fctx,
 	mcontext_t * tctx,
-	struct _nt_dispatcher_context * dctx,
+	struct __dispatcher_context * dctx,
 	__unwind_personality_routine uw_routine)
 {
 	return __eh_vtbl->seh_exception_filter(
@@ -19,10 +19,10 @@ int __unwind_exception_filter(
 
 
 int __unwind_exception_handler(
-	struct _nt_exception_record * erec,
+	struct __exception_record * erec,
 	uintptr_t fbase,
 	mcontext_t * tctx,
-	struct _nt_dispatcher_context * dctx)
+	struct __dispatcher_context * dctx)
 {
 	return __eh_vtbl->seh_exception_handler(
 		erec,fbase,tctx,dctx);