From b945a6bdf089590cce80e17862d03fbacc5bb3c7 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 26 Jan 2019 22:37:58 +0000 Subject: psxglue.h: update following libpsxscl's introduction of __psx_user_frame(). --- src/arch/nt32/crt_glue.c | 9 +++------ src/arch/nt64/crt_glue.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/arch/nt32/crt_glue.c b/src/arch/nt32/crt_glue.c index eb5cc6a..29effe8 100644 --- a/src/arch/nt32/crt_glue.c +++ b/src/arch/nt32/crt_glue.c @@ -9,9 +9,6 @@ extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; -typedef int __app_main(); -typedef int __pthread_surrogate_routine(struct pthread *); - static int __pthread_surrogate_init(struct pthread * self); extern int __libc_start_main( @@ -52,7 +49,7 @@ void __init_tls (size_t * auxv) }; void __libc_entry_routine( - __app_main * __main, + int (*main)(), __psx_init_routine * __psx_init, const unsigned short * __ctty, int options) @@ -65,7 +62,7 @@ void __libc_entry_routine( /* ctx init */ ctx.size = sizeof(ctx); ctx.options = options; - ctx.usrmain = __main; + ctx.usrmain = main; ctx.ldsoaddr = _init; ctx.ctty = __ctty; ctx.pthread_create_fn = pthread_create; @@ -91,7 +88,7 @@ void __libc_entry_routine( __global_dtors_fn = __psx_vtbl->do_global_dtors_fn; /* enter libc */ - __psx_vtbl->start_main(__main,argc,argv,__libc_start_main); + __psx_vtbl->start_main(argc,argv,__libc_start_main); /* guard */ a_crash(); diff --git a/src/arch/nt64/crt_glue.c b/src/arch/nt64/crt_glue.c index eb5cc6a..29effe8 100644 --- a/src/arch/nt64/crt_glue.c +++ b/src/arch/nt64/crt_glue.c @@ -9,9 +9,6 @@ extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; -typedef int __app_main(); -typedef int __pthread_surrogate_routine(struct pthread *); - static int __pthread_surrogate_init(struct pthread * self); extern int __libc_start_main( @@ -52,7 +49,7 @@ void __init_tls (size_t * auxv) }; void __libc_entry_routine( - __app_main * __main, + int (*main)(), __psx_init_routine * __psx_init, const unsigned short * __ctty, int options) @@ -65,7 +62,7 @@ void __libc_entry_routine( /* ctx init */ ctx.size = sizeof(ctx); ctx.options = options; - ctx.usrmain = __main; + ctx.usrmain = main; ctx.ldsoaddr = _init; ctx.ctty = __ctty; ctx.pthread_create_fn = pthread_create; @@ -91,7 +88,7 @@ void __libc_entry_routine( __global_dtors_fn = __psx_vtbl->do_global_dtors_fn; /* enter libc */ - __psx_vtbl->start_main(__main,argc,argv,__libc_start_main); + __psx_vtbl->start_main(argc,argv,__libc_start_main); /* guard */ a_crash(); -- cgit v1.2.3