summaryrefslogtreecommitdiffhomepage
path: root/src/arch/nt32
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2019-01-26 22:37:58 +0000
committermidipix <writeonce@midipix.org>2019-01-26 17:47:02 -0500
commitb945a6bdf089590cce80e17862d03fbacc5bb3c7 (patch)
treecdf7bc6f5180737dc9c71f54c4ee53c97b146542 /src/arch/nt32
parentfaeb2359bdab1bfa37904d58cec35a8c1be1b983 (diff)
downloadmmglue-b945a6bdf089590cce80e17862d03fbacc5bb3c7.tar.bz2
mmglue-b945a6bdf089590cce80e17862d03fbacc5bb3c7.tar.xz
psxglue.h: update following libpsxscl's introduction of __psx_user_frame().
Diffstat (limited to 'src/arch/nt32')
-rw-r--r--src/arch/nt32/crt_glue.c9
1 files changed, 3 insertions, 6 deletions
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();