From 149d72d3e18d379b7640e0cc4e7e81377622a232 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sun, 15 Jan 2006 22:32:38 +0000 Subject: * Merged ioq3-r492 --- src/qcommon/vm_x86.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/qcommon/vm_x86.c') diff --git a/src/qcommon/vm_x86.c b/src/qcommon/vm_x86.c index 617c4ac4..c387c216 100644 --- a/src/qcommon/vm_x86.c +++ b/src/qcommon/vm_x86.c @@ -171,7 +171,7 @@ _asm { #else //!_MSC_VER -#ifdef __MINGW32__ // _ is prepended to compiled symbols +#if defined(__MINGW32__) || defined(MACOS_X) // _ is prepended to compiled symbols #define CMANG(sym) "_"#sym #else #define CMANG(sym) #sym @@ -1175,13 +1175,13 @@ int VM_CallCompiled( vm_t *vm, int *args ) { memOpStack = opStack; memEntryPoint = entryPoint; - __asm__(" pushal \r\n" \ - " movl %0,%%esi \r\n" \ - " movl %1,%%edi \r\n" \ - " call *%2 \r\n" \ - " movl %%esi,%0 \r\n" \ - " movl %%edi,%1 \r\n" \ - " popal \r\n" \ + __asm__(" pushal \n" \ + " movl %0,%%esi \n" \ + " movl %1,%%edi \n" \ + " call *%2 \n" \ + " movl %%esi,%0 \n" \ + " movl %%edi,%1 \n" \ + " popal \n" \ : "=m" (memProgramStack), "=m" (memOpStack) \ : "m" (memEntryPoint), "m" (memProgramStack), "m" (memOpStack) \ : "si", "di" \ -- cgit