summaryrefslogtreecommitdiff
path: root/src/qcommon/vm_x86.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-01-15 22:32:38 +0000
committerTim Angus <tim@ngus.net>2006-01-15 22:32:38 +0000
commit149d72d3e18d379b7640e0cc4e7e81377622a232 (patch)
treeefd1f51fa6d78f375900dc0dbdddac67f32d3fa1 /src/qcommon/vm_x86.c
parentaf64f1b52b1a28adbf771ef644c76454d148d5ec (diff)
* Merged ioq3-r492
Diffstat (limited to 'src/qcommon/vm_x86.c')
-rw-r--r--src/qcommon/vm_x86.c16
1 files changed, 8 insertions, 8 deletions
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" \