From 202d814e20e0615d602247a1e3bf3bf2d82128c5 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Tue, 19 Jun 2012 14:57:51 +0000
Subject: when interacting with QVMs, Clang/LLVM requires the standard use of
 the va_*() macros instead of (fast) call hacks

From /dev/humancontroller.
---
 src/qcommon/vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c
index b7860896..8d959038 100644
--- a/src/qcommon/vm.c
+++ b/src/qcommon/vm.c
@@ -337,7 +337,7 @@ Dlls will call this directly
 ============
 */
 intptr_t QDECL VM_DllSyscall( intptr_t arg, ... ) {
-#if !id386
+#if !id386 || defined __clang__
   // rcg010206 - see commentary above
   intptr_t args[16];
   int i;
@@ -836,7 +836,7 @@ intptr_t QDECL VM_Call( vm_t *vm, int callnum, ... )
                             args[4],  args[5],  args[6], args[7],
                             args[8],  args[9]);
 	} else {
-#if id386 || idsparc // i386/sparc calling convention doesn't need conversion
+#if ( id386 || idsparc ) && !defined __clang__ // calling convention doesn't need conversion in some cases
 #ifndef NO_VM_COMPILED
 		if ( vm->compiled )
 			r = VM_CallCompiled( vm, (int*)&callnum );
-- 
cgit