From 36ba22bb97b383c34d7ed3bc66ffad3dae9232fc Mon Sep 17 00:00:00 2001 From: n-a-c-h <> Date: Wed, 23 Feb 2005 07:28:43 +0000 Subject: [PATCH] Prototyped function properly, updated instructions for asm_call(). --- zsnes/src/asm_call.h | 5 +++++ zsnes/src/uic.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zsnes/src/asm_call.h b/zsnes/src/asm_call.h index b8caee68..61dd821e 100644 --- a/zsnes/src/asm_call.h +++ b/zsnes/src/asm_call.h @@ -30,6 +30,11 @@ Usage: That's all there is to it!!! + +Note: Make sure this is used on a line by itself if the file will ever be +compiled with MSVC, since it's preproccessor won't parse the inline +assembly correctly if other stuff are on the line + Note: This will not work with GCC when using the parameter -MASM=intel I'd fix that if anyone knows if that parameter defines something I can check diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c index a28f719f..92d5ac80 100644 --- a/zsnes/src/uic.c +++ b/zsnes/src/uic.c @@ -140,6 +140,8 @@ unsigned char *spc7110romptr; unsigned char MusicRelVol = 75; unsigned char MusicVol = 0; +void outofmemory(); + void *doMemAlloc(size_t size) { void *ptr = NULL; @@ -207,8 +209,6 @@ unsigned char *ZVERSION = "Pre 1.43"; unsigned char txtfailedalignd[25] = "Data Alignment Failure : "; unsigned char txtfailedalignc[25] = "Code Alignment Failure : "; -void outofmemory(); - void zstart () { unsigned int ptr;